ci: regenerated with OpenAPI Doc , Speakeasy CLI 1.615.2

.gitignore

@@ -1,3 +1,8 @@
+.env
+.env.local
+.DS_Store
+**/.speakeasy/temp/
+**/.speakeasy/logs/
 obj/
 bin/
 debug/

.speakeasy/gen.yaml

@@ -4,22 +4,36 @@ generation:
   maintainOpenAPIOrder: true
   usageSnippets:
     optionalPropertyRendering: withExample
+    sdkInitStyle: constructor
   useClassNamesForArrayFields: true
   fixes:
     nameResolutionDec2023: true
+    nameResolutionFeb2025: false
     parameterOrderingFeb2024: true
     requestResponseComponentNamesFeb2024: true
+    securityFeb2025: false
+    sharedErrorComponentsApr2025: false
   auth:
     oAuth2ClientCredentialsEnabled: true
+    oAuth2PasswordEnabled: false
+    hoistGlobalSecurity: true
+  tests:
+    generateTests: true
+    generateNewTests: false
+    skipResponseBodyAssertions: false
 csharp:
-  version: 0.9.0
+  version: 0.17.0
   additionalDependencies: []
   author: LukeHagar
+  baseErrorName: PlexAPIError
   clientServerStatusCodesAsErrors: true
+  defaultErrorName: SDKException
   disableNamespacePascalCasingApr2024: true
   dotnetVersion: net8.0
   enableSourceLink: true
   flattenGlobalSecurity: true
+  flatteningOrder: ""
+  httpClientPrefix: Speakeasy
   imports:
     option: openapi
     paths:
@@ -31,6 +45,7 @@ csharp:
   includeDebugSymbols: true
   inputModelSuffix: input
   maxMethodParams: 4
+  methodArguments: infer-optional-args
   outputModelSuffix: output
   packageName: LukeHagar.PlexAPI.SDK
   packageTags: Plex Media Server SDK

.speakeasy/workflow.lock

@@ -1,4 +1,4 @@
-speakeasyVersion: 1.405.8
+speakeasyVersion: 1.615.2
 sources:
     my-source:
         sourceNamespace: my-source
@@ -16,19 +16,19 @@ sources:
             - main
     plexapi:
         sourceNamespace: plexapi
-        sourceRevisionDigest: sha256:b1e231bd781f352738612b0158382ba51cfac32e97c23d9e4913aab5501e9529
+        sourceRevisionDigest: sha256:5125adfea1b0daea399c6ecf755e32795de6b4131465ae6a1f32ad73b3bc7787
-        sourceBlobDigest: sha256:8ce05d5965182eb3fe9376715c269b9e1c7f3e2d90273c175a4181735f41daa0
+        sourceBlobDigest: sha256:95cea18b6e5f7d76d35db0aba5bcb59e72cf204451a2b09a99be0e3e9ec1f4c0
         tags:
             - latest
-            - main
+            - speakeasy-sdk-regen-1757895932
 targets:
     plexcsharp:
         source: plexapi
         sourceNamespace: plexapi
-        sourceRevisionDigest: sha256:b1e231bd781f352738612b0158382ba51cfac32e97c23d9e4913aab5501e9529
+        sourceRevisionDigest: sha256:5125adfea1b0daea399c6ecf755e32795de6b4131465ae6a1f32ad73b3bc7787
-        sourceBlobDigest: sha256:8ce05d5965182eb3fe9376715c269b9e1c7f3e2d90273c175a4181735f41daa0
+        sourceBlobDigest: sha256:95cea18b6e5f7d76d35db0aba5bcb59e72cf204451a2b09a99be0e3e9ec1f4c0
         codeSamplesNamespace: code-samples-csharp-plexcsharp
-        codeSamplesRevisionDigest: sha256:58fe70fa1a5c905723a25f3e8c72551cc91f8227b052f13d826b5a6b25eb7049
+        codeSamplesRevisionDigest: sha256:41c049f80e89195d5537bfbc2aa652942aeb669534f6c7d22e2172361fd708aa
 workflow:
     workflowVersion: 1.0.0
     speakeasyVersion: latest
@@ -47,3 +47,5 @@ workflow:
                 output: codeSamples.yaml
                 registry:
                     location: registry.speakeasyapi.dev/plexapi/plexapi/code-samples-csharp-plexcsharp
+                labelOverride:
+                    fixedValue: PlexCSharp

.speakeasy/workflow.yaml

@@ -15,3 +15,5 @@ targets:
             output: codeSamples.yaml
             registry:
                 location: registry.speakeasyapi.dev/plexapi/plexapi/code-samples-csharp-plexcsharp
+            labelOverride:
+                fixedValue: PlexCSharp

LukeHagar/PlexAPI/SDK/Activities.cs

@@ -13,14 +13,14 @@ namespace LukeHagar.PlexAPI.SDK
     using LukeHagar.PlexAPI.SDK.Models.Components;
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Models.Requests;
-    using LukeHagar.PlexAPI.SDK.Utils.Retries;
     using LukeHagar.PlexAPI.SDK.Utils;
+    using LukeHagar.PlexAPI.SDK.Utils.Retries;
     using Newtonsoft.Json;
-    using System.Collections.Generic;
-    using System.Net.Http.Headers;
-    using System.Net.Http;
-    using System.Threading.Tasks;
     using System;
+    using System.Collections.Generic;
+    using System.Net.Http;
+    using System.Net.Http.Headers;
+    using System.Threading.Tasks;
 
     /// <summary>
     /// Activities are awesome. They provide a way to monitor and control asynchronous operations on the server. In order to receive real-time updates for activities, a client would normally subscribe via either EventSource or Websocket endpoints.<br/>
@@ -45,7 +45,7 @@ namespace LukeHagar.PlexAPI.SDK
         /// Get Server Activities
         /// </remarks>
         /// </summary>
-        Task<GetServerActivitiesResponse> GetServerActivitiesAsync(RetryConfig? retryConfig = null);
+        Task<GetServerActivitiesResponse> GetServerActivitiesAsync();
 
         /// <summary>
         /// Cancel Server Activities
@@ -54,7 +54,7 @@ namespace LukeHagar.PlexAPI.SDK
         /// Cancel Server Activities
         /// </remarks>
         /// </summary>
-        Task<CancelServerActivitiesResponse> CancelServerActivitiesAsync(string activityUUID, RetryConfig? retryConfig = null);
+        Task<CancelServerActivitiesResponse> CancelServerActivitiesAsync(string activityUUID);
     }
 
     /// <summary>
@@ -74,77 +74,37 @@ namespace LukeHagar.PlexAPI.SDK
     {
         public SDKConfig SDKConfiguration { get; private set; }
         private const string _language = "csharp";
-        private const string _sdkVersion = "0.9.0";
+        private const string _sdkVersion = "0.17.0";
-        private const string _sdkGenVersion = "2.429.0";
+        private const string _sdkGenVersion = "2.698.4";
         private const string _openapiDocVersion = "0.0.3";
-        private const string _userAgent = "speakeasy-sdk/csharp 0.9.0 2.429.0 0.0.3 LukeHagar.PlexAPI.SDK";
-        private string _serverUrl = "";
-        private ISpeakeasyHttpClient _client;
-        private Func<LukeHagar.PlexAPI.SDK.Models.Components.Security>? _securitySource;
 
-        public Activities(ISpeakeasyHttpClient client, Func<LukeHagar.PlexAPI.SDK.Models.Components.Security>? securitySource, string serverUrl, SDKConfig config)
+        public Activities(SDKConfig config)
         {
-            _client = client;
-            _securitySource = securitySource;
-            _serverUrl = serverUrl;
             SDKConfiguration = config;
         }
 
-        public async Task<GetServerActivitiesResponse> GetServerActivitiesAsync(RetryConfig? retryConfig = null)
+        public async Task<GetServerActivitiesResponse> GetServerActivitiesAsync()
         {
             string baseUrl = this.SDKConfiguration.GetTemplatedServerUrl();
 
             var urlString = baseUrl + "/activities";
 
             var httpRequest = new HttpRequestMessage(HttpMethod.Get, urlString);
-            httpRequest.Headers.Add("user-agent", _userAgent);
+            httpRequest.Headers.Add("user-agent", SDKConfiguration.UserAgent);
 
-            if (_securitySource != null)
+            if (SDKConfiguration.SecuritySource != null)
             {
-                httpRequest = new SecurityMetadata(_securitySource).Apply(httpRequest);
+                httpRequest = new SecurityMetadata(SDKConfiguration.SecuritySource).Apply(httpRequest);
             }
 
-            var hookCtx = new HookContext("getServerActivities", null, _securitySource);
+            var hookCtx = new HookContext(SDKConfiguration, baseUrl, "getServerActivities", new List<string> {  }, SDKConfiguration.SecuritySource);
 
             httpRequest = await this.SDKConfiguration.Hooks.BeforeRequestAsync(new BeforeRequestContext(hookCtx), httpRequest);
-            if (retryConfig == null)
-            {
-                if (this.SDKConfiguration.RetryConfig != null)
-                {
-                    retryConfig = this.SDKConfiguration.RetryConfig;
-                }
-                else
-                {
-                    var backoff = new BackoffStrategy(
-                        initialIntervalMs: 500L,
-                        maxIntervalMs: 60000L,
-                        maxElapsedTimeMs: 3600000L,
-                        exponent: 1.5
-                    );
-                    retryConfig = new RetryConfig(
-                        strategy: RetryConfig.RetryStrategy.BACKOFF,
-                        backoff: backoff,
-                        retryConnectionErrors: true
-                    );
-                }
-            }
-
-            List<string> statusCodes = new List<string>
-            {
-                "5XX",
-            };
-
-            Func<Task<HttpResponseMessage>> retrySend = async () =>
-            {
-                var _httpRequest = await _client.CloneAsync(httpRequest);
-                return await _client.SendAsync(_httpRequest);
-            };
-            var retries = new LukeHagar.PlexAPI.SDK.Utils.Retries.Retries(retrySend, retryConfig, statusCodes);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await retries.Run();
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -177,7 +137,17 @@ namespace LukeHagar.PlexAPI.SDK
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<GetServerActivitiesResponseBody>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    GetServerActivitiesResponseBody obj;
+                    try
+                    {
+                        obj = ResponseBodyDeserializer.DeserializeNotNull<GetServerActivitiesResponseBody>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetServerActivitiesResponseBody.", httpResponse, httpResponseBody, ex);
+                    }
+
                     var response = new GetServerActivitiesResponse()
                     {
                         StatusCode = responseStatusCode,
@@ -188,39 +158,63 @@ namespace LukeHagar.PlexAPI.SDK
                     return response;
                 }
 
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
             else if(responseStatusCode == 400)
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<GetServerActivitiesBadRequest>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    GetServerActivitiesBadRequestPayload payload;
-                    throw obj!;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetServerActivitiesBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetServerActivitiesBadRequestPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new GetServerActivitiesBadRequest(payload, httpResponse, httpResponseBody);
+                }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
             else if(responseStatusCode == 401)
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<GetServerActivitiesUnauthorized>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    GetServerActivitiesUnauthorizedPayload payload;
-                    throw obj!;
+                    try
-                }
-
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
-            }
-            else if(responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
                     {
-                throw new Models.Errors.SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetServerActivitiesUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetServerActivitiesUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-            throw new Models.Errors.SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new GetServerActivitiesUnauthorized(payload, httpResponse, httpResponseBody);
                 }
 
-        public async Task<CancelServerActivitiesResponse> CancelServerActivitiesAsync(string activityUUID, RetryConfig? retryConfig = null)
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+
+            throw new Models.Errors.SDKException("Unknown status code received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+        }
+
+        public async Task<CancelServerActivitiesResponse> CancelServerActivitiesAsync(string activityUUID)
         {
             var request = new CancelServerActivitiesRequest()
             {
@@ -230,54 +224,21 @@ namespace LukeHagar.PlexAPI.SDK
             var urlString = URLBuilder.Build(baseUrl, "/activities/{activityUUID}", request);
 
             var httpRequest = new HttpRequestMessage(HttpMethod.Delete, urlString);
-            httpRequest.Headers.Add("user-agent", _userAgent);
+            httpRequest.Headers.Add("user-agent", SDKConfiguration.UserAgent);
 
-            if (_securitySource != null)
+            if (SDKConfiguration.SecuritySource != null)
             {
-                httpRequest = new SecurityMetadata(_securitySource).Apply(httpRequest);
+                httpRequest = new SecurityMetadata(SDKConfiguration.SecuritySource).Apply(httpRequest);
             }
 
-            var hookCtx = new HookContext("cancelServerActivities", null, _securitySource);
+            var hookCtx = new HookContext(SDKConfiguration, baseUrl, "cancelServerActivities", new List<string> {  }, SDKConfiguration.SecuritySource);
 
             httpRequest = await this.SDKConfiguration.Hooks.BeforeRequestAsync(new BeforeRequestContext(hookCtx), httpRequest);
-            if (retryConfig == null)
-            {
-                if (this.SDKConfiguration.RetryConfig != null)
-                {
-                    retryConfig = this.SDKConfiguration.RetryConfig;
-                }
-                else
-                {
-                    var backoff = new BackoffStrategy(
-                        initialIntervalMs: 500L,
-                        maxIntervalMs: 60000L,
-                        maxElapsedTimeMs: 3600000L,
-                        exponent: 1.5
-                    );
-                    retryConfig = new RetryConfig(
-                        strategy: RetryConfig.RetryStrategy.BACKOFF,
-                        backoff: backoff,
-                        retryConnectionErrors: true
-                    );
-                }
-            }
-
-            List<string> statusCodes = new List<string>
-            {
-                "5XX",
-            };
-
-            Func<Task<HttpResponseMessage>> retrySend = async () =>
-            {
-                var _httpRequest = await _client.CloneAsync(httpRequest);
-                return await _client.SendAsync(_httpRequest);
-            };
-            var retries = new LukeHagar.PlexAPI.SDK.Utils.Retries.Retries(retrySend, retryConfig, statusCodes);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await retries.Run();
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -319,30 +280,54 @@ namespace LukeHagar.PlexAPI.SDK
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<CancelServerActivitiesBadRequest>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    CancelServerActivitiesBadRequestPayload payload;
-                    throw obj!;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<CancelServerActivitiesBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into CancelServerActivitiesBadRequestPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new CancelServerActivitiesBadRequest(payload, httpResponse, httpResponseBody);
+                }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
             else if(responseStatusCode == 401)
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<CancelServerActivitiesUnauthorized>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    CancelServerActivitiesUnauthorizedPayload payload;
-                    throw obj!;
+                    try
-                }
-
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
-            }
-            else if(responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
                     {
-                throw new Models.Errors.SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<CancelServerActivitiesUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into CancelServerActivitiesUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-            throw new Models.Errors.SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new CancelServerActivitiesUnauthorized(payload, httpResponse, httpResponseBody);
+                }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+
+            throw new Models.Errors.SDKException("Unknown status code received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
         }
     }
 }

LukeHagar/PlexAPI/SDK/Authentication.cs

@@ -13,14 +13,14 @@ namespace LukeHagar.PlexAPI.SDK
     using LukeHagar.PlexAPI.SDK.Models.Components;
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Models.Requests;
-    using LukeHagar.PlexAPI.SDK.Utils.Retries;
     using LukeHagar.PlexAPI.SDK.Utils;
+    using LukeHagar.PlexAPI.SDK.Utils.Retries;
     using Newtonsoft.Json;
-    using System.Collections.Generic;
-    using System.Net.Http.Headers;
-    using System.Net.Http;
-    using System.Threading.Tasks;
     using System;
+    using System.Collections.Generic;
+    using System.Net.Http;
+    using System.Net.Http.Headers;
+    using System.Threading.Tasks;
 
     /// <summary>
     /// API Calls regarding authentication for Plex Media Server<br/>
@@ -40,7 +40,7 @@ namespace LukeHagar.PlexAPI.SDK
         /// 
         /// </remarks>
         /// </summary>
-        Task<GetTransientTokenResponse> GetTransientTokenAsync(GetTransientTokenQueryParamType type, Scope scope, RetryConfig? retryConfig = null);
+        Task<GetTransientTokenResponse> GetTransientTokenAsync(GetTransientTokenQueryParamType type, Scope scope);
 
         /// <summary>
         /// Get Source Connection Information
@@ -51,7 +51,7 @@ namespace LukeHagar.PlexAPI.SDK
         /// 
         /// </remarks>
         /// </summary>
-        Task<GetSourceConnectionInformationResponse> GetSourceConnectionInformationAsync(string source, RetryConfig? retryConfig = null);
+        Task<GetSourceConnectionInformationResponse> GetSourceConnectionInformationAsync(string source);
 
         /// <summary>
         /// Get Token Details
@@ -60,7 +60,7 @@ namespace LukeHagar.PlexAPI.SDK
         /// Get the User data from the provided X-Plex-Token
         /// </remarks>
         /// </summary>
-        Task<GetTokenDetailsResponse> GetTokenDetailsAsync(string? serverUrl = null, RetryConfig? retryConfig = null);
+        Task<GetTokenDetailsResponse> GetTokenDetailsAsync(string? serverUrl = null);
 
         /// <summary>
         /// Get User Sign In Data
@@ -69,7 +69,7 @@ namespace LukeHagar.PlexAPI.SDK
         /// Sign in user with username and password and return user data with Plex authentication token
         /// </remarks>
         /// </summary>
-        Task<PostUsersSignInDataResponse> PostUsersSignInDataAsync(PostUsersSignInDataRequest? request = null, string? serverUrl = null, RetryConfig? retryConfig = null);
+        Task<PostUsersSignInDataResponse> PostUsersSignInDataAsync(PostUsersSignInDataRequest request, string? serverUrl = null);
     }
 
     /// <summary>
@@ -95,23 +95,16 @@ namespace LukeHagar.PlexAPI.SDK
         };
         public SDKConfig SDKConfiguration { get; private set; }
         private const string _language = "csharp";
-        private const string _sdkVersion = "0.9.0";
+        private const string _sdkVersion = "0.17.0";
-        private const string _sdkGenVersion = "2.429.0";
+        private const string _sdkGenVersion = "2.698.4";
         private const string _openapiDocVersion = "0.0.3";
-        private const string _userAgent = "speakeasy-sdk/csharp 0.9.0 2.429.0 0.0.3 LukeHagar.PlexAPI.SDK";
-        private string _serverUrl = "";
-        private ISpeakeasyHttpClient _client;
-        private Func<LukeHagar.PlexAPI.SDK.Models.Components.Security>? _securitySource;
 
-        public Authentication(ISpeakeasyHttpClient client, Func<LukeHagar.PlexAPI.SDK.Models.Components.Security>? securitySource, string serverUrl, SDKConfig config)
+        public Authentication(SDKConfig config)
         {
-            _client = client;
-            _securitySource = securitySource;
-            _serverUrl = serverUrl;
             SDKConfiguration = config;
         }
 
-        public async Task<GetTransientTokenResponse> GetTransientTokenAsync(GetTransientTokenQueryParamType type, Scope scope, RetryConfig? retryConfig = null)
+        public async Task<GetTransientTokenResponse> GetTransientTokenAsync(GetTransientTokenQueryParamType type, Scope scope)
         {
             var request = new GetTransientTokenRequest()
             {
@@ -122,54 +115,21 @@ namespace LukeHagar.PlexAPI.SDK
             var urlString = URLBuilder.Build(baseUrl, "/security/token", request);
 
             var httpRequest = new HttpRequestMessage(HttpMethod.Get, urlString);
-            httpRequest.Headers.Add("user-agent", _userAgent);
+            httpRequest.Headers.Add("user-agent", SDKConfiguration.UserAgent);
 
-            if (_securitySource != null)
+            if (SDKConfiguration.SecuritySource != null)
             {
-                httpRequest = new SecurityMetadata(_securitySource).Apply(httpRequest);
+                httpRequest = new SecurityMetadata(SDKConfiguration.SecuritySource).Apply(httpRequest);
             }
 
-            var hookCtx = new HookContext("getTransientToken", null, _securitySource);
+            var hookCtx = new HookContext(SDKConfiguration, baseUrl, "getTransientToken", new List<string> {  }, SDKConfiguration.SecuritySource);
 
             httpRequest = await this.SDKConfiguration.Hooks.BeforeRequestAsync(new BeforeRequestContext(hookCtx), httpRequest);
-            if (retryConfig == null)
-            {
-                if (this.SDKConfiguration.RetryConfig != null)
-                {
-                    retryConfig = this.SDKConfiguration.RetryConfig;
-                }
-                else
-                {
-                    var backoff = new BackoffStrategy(
-                        initialIntervalMs: 500L,
-                        maxIntervalMs: 60000L,
-                        maxElapsedTimeMs: 3600000L,
-                        exponent: 1.5
-                    );
-                    retryConfig = new RetryConfig(
-                        strategy: RetryConfig.RetryStrategy.BACKOFF,
-                        backoff: backoff,
-                        retryConnectionErrors: true
-                    );
-                }
-            }
-
-            List<string> statusCodes = new List<string>
-            {
-                "5XX",
-            };
-
-            Func<Task<HttpResponseMessage>> retrySend = async () =>
-            {
-                var _httpRequest = await _client.CloneAsync(httpRequest);
-                return await _client.SendAsync(_httpRequest);
-            };
-            var retries = new LukeHagar.PlexAPI.SDK.Utils.Retries.Retries(retrySend, retryConfig, statusCodes);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await retries.Run();
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -211,33 +171,57 @@ namespace LukeHagar.PlexAPI.SDK
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<GetTransientTokenBadRequest>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    GetTransientTokenBadRequestPayload payload;
-                    throw obj!;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetTransientTokenBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetTransientTokenBadRequestPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new GetTransientTokenBadRequest(payload, httpResponse, httpResponseBody);
+                }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
             else if(responseStatusCode == 401)
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<GetTransientTokenUnauthorized>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    GetTransientTokenUnauthorizedPayload payload;
-                    throw obj!;
+                    try
-                }
-
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
-            }
-            else if(responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
                     {
-                throw new Models.Errors.SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetTransientTokenUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetTransientTokenUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-            throw new Models.Errors.SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new GetTransientTokenUnauthorized(payload, httpResponse, httpResponseBody);
                 }
 
-        public async Task<GetSourceConnectionInformationResponse> GetSourceConnectionInformationAsync(string source, RetryConfig? retryConfig = null)
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+
+            throw new Models.Errors.SDKException("Unknown status code received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+        }
+
+        public async Task<GetSourceConnectionInformationResponse> GetSourceConnectionInformationAsync(string source)
         {
             var request = new GetSourceConnectionInformationRequest()
             {
@@ -247,54 +231,21 @@ namespace LukeHagar.PlexAPI.SDK
             var urlString = URLBuilder.Build(baseUrl, "/security/resources", request);
 
             var httpRequest = new HttpRequestMessage(HttpMethod.Get, urlString);
-            httpRequest.Headers.Add("user-agent", _userAgent);
+            httpRequest.Headers.Add("user-agent", SDKConfiguration.UserAgent);
 
-            if (_securitySource != null)
+            if (SDKConfiguration.SecuritySource != null)
             {
-                httpRequest = new SecurityMetadata(_securitySource).Apply(httpRequest);
+                httpRequest = new SecurityMetadata(SDKConfiguration.SecuritySource).Apply(httpRequest);
             }
 
-            var hookCtx = new HookContext("getSourceConnectionInformation", null, _securitySource);
+            var hookCtx = new HookContext(SDKConfiguration, baseUrl, "getSourceConnectionInformation", new List<string> {  }, SDKConfiguration.SecuritySource);
 
             httpRequest = await this.SDKConfiguration.Hooks.BeforeRequestAsync(new BeforeRequestContext(hookCtx), httpRequest);
-            if (retryConfig == null)
-            {
-                if (this.SDKConfiguration.RetryConfig != null)
-                {
-                    retryConfig = this.SDKConfiguration.RetryConfig;
-                }
-                else
-                {
-                    var backoff = new BackoffStrategy(
-                        initialIntervalMs: 500L,
-                        maxIntervalMs: 60000L,
-                        maxElapsedTimeMs: 3600000L,
-                        exponent: 1.5
-                    );
-                    retryConfig = new RetryConfig(
-                        strategy: RetryConfig.RetryStrategy.BACKOFF,
-                        backoff: backoff,
-                        retryConnectionErrors: true
-                    );
-                }
-            }
-
-            List<string> statusCodes = new List<string>
-            {
-                "5XX",
-            };
-
-            Func<Task<HttpResponseMessage>> retrySend = async () =>
-            {
-                var _httpRequest = await _client.CloneAsync(httpRequest);
-                return await _client.SendAsync(_httpRequest);
-            };
-            var retries = new LukeHagar.PlexAPI.SDK.Utils.Retries.Retries(retrySend, retryConfig, statusCodes);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await retries.Run();
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -336,33 +287,57 @@ namespace LukeHagar.PlexAPI.SDK
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<GetSourceConnectionInformationBadRequest>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    GetSourceConnectionInformationBadRequestPayload payload;
-                    throw obj!;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetSourceConnectionInformationBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetSourceConnectionInformationBadRequestPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new GetSourceConnectionInformationBadRequest(payload, httpResponse, httpResponseBody);
+                }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
             else if(responseStatusCode == 401)
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<GetSourceConnectionInformationUnauthorized>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    GetSourceConnectionInformationUnauthorizedPayload payload;
-                    throw obj!;
+                    try
-                }
-
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
-            }
-            else if(responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
                     {
-                throw new Models.Errors.SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetSourceConnectionInformationUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetSourceConnectionInformationUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-            throw new Models.Errors.SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new GetSourceConnectionInformationUnauthorized(payload, httpResponse, httpResponseBody);
                 }
 
-        public async Task<GetTokenDetailsResponse> GetTokenDetailsAsync(string? serverUrl = null, RetryConfig? retryConfig = null)
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+
+            throw new Models.Errors.SDKException("Unknown status code received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+        }
+
+        public async Task<GetTokenDetailsResponse> GetTokenDetailsAsync(string? serverUrl = null)
         {
             string baseUrl = Utilities.TemplateUrl(GetTokenDetailsServerList[0], new Dictionary<string, string>(){
             });
@@ -374,54 +349,21 @@ namespace LukeHagar.PlexAPI.SDK
             var urlString = baseUrl + "/user";
 
             var httpRequest = new HttpRequestMessage(HttpMethod.Get, urlString);
-            httpRequest.Headers.Add("user-agent", _userAgent);
+            httpRequest.Headers.Add("user-agent", SDKConfiguration.UserAgent);
 
-            if (_securitySource != null)
+            if (SDKConfiguration.SecuritySource != null)
             {
-                httpRequest = new SecurityMetadata(_securitySource).Apply(httpRequest);
+                httpRequest = new SecurityMetadata(SDKConfiguration.SecuritySource).Apply(httpRequest);
             }
 
-            var hookCtx = new HookContext("getTokenDetails", null, _securitySource);
+            var hookCtx = new HookContext(SDKConfiguration, baseUrl, "getTokenDetails", new List<string> {  }, SDKConfiguration.SecuritySource);
 
             httpRequest = await this.SDKConfiguration.Hooks.BeforeRequestAsync(new BeforeRequestContext(hookCtx), httpRequest);
-            if (retryConfig == null)
-            {
-                if (this.SDKConfiguration.RetryConfig != null)
-                {
-                    retryConfig = this.SDKConfiguration.RetryConfig;
-                }
-                else
-                {
-                    var backoff = new BackoffStrategy(
-                        initialIntervalMs: 500L,
-                        maxIntervalMs: 60000L,
-                        maxElapsedTimeMs: 3600000L,
-                        exponent: 1.5
-                    );
-                    retryConfig = new RetryConfig(
-                        strategy: RetryConfig.RetryStrategy.BACKOFF,
-                        backoff: backoff,
-                        retryConnectionErrors: true
-                    );
-                }
-            }
-
-            List<string> statusCodes = new List<string>
-            {
-                "5XX",
-            };
-
-            Func<Task<HttpResponseMessage>> retrySend = async () =>
-            {
-                var _httpRequest = await _client.CloneAsync(httpRequest);
-                return await _client.SendAsync(_httpRequest);
-            };
-            var retries = new LukeHagar.PlexAPI.SDK.Utils.Retries.Retries(retrySend, retryConfig, statusCodes);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await retries.Run();
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -454,7 +396,17 @@ namespace LukeHagar.PlexAPI.SDK
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<GetTokenDetailsUserPlexAccount>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    GetTokenDetailsUserPlexAccount obj;
+                    try
+                    {
+                        obj = ResponseBodyDeserializer.DeserializeNotNull<GetTokenDetailsUserPlexAccount>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetTokenDetailsUserPlexAccount.", httpResponse, httpResponseBody, ex);
+                    }
+
                     var response = new GetTokenDetailsResponse()
                     {
                         StatusCode = responseStatusCode,
@@ -465,46 +417,64 @@ namespace LukeHagar.PlexAPI.SDK
                     return response;
                 }
 
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
             else if(responseStatusCode == 400)
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<GetTokenDetailsBadRequest>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    GetTokenDetailsBadRequestPayload payload;
-                    throw obj!;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetTokenDetailsBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetTokenDetailsBadRequestPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new GetTokenDetailsBadRequest(payload, httpResponse, httpResponseBody);
+                }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
             else if(responseStatusCode == 401)
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<GetTokenDetailsUnauthorized>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    GetTokenDetailsUnauthorizedPayload payload;
-                    throw obj!;
+                    try
-                }
-
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
-            }
-            else if(responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
                     {
-                throw new Models.Errors.SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetTokenDetailsUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
                     }
-
+                    catch (Exception ex)
-            throw new Models.Errors.SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
-        }
-
-        public async Task<PostUsersSignInDataResponse> PostUsersSignInDataAsync(PostUsersSignInDataRequest? request = null, string? serverUrl = null, RetryConfig? retryConfig = null)
                     {
-            request.ClientID ??= SDKConfiguration.ClientID;
+                        throw new ResponseValidationException("Failed to deserialize response body into GetTokenDetailsUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
-            request.ClientName ??= SDKConfiguration.ClientName;
+                    }
-            request.ClientVersion ??= SDKConfiguration.ClientVersion;
-            request.Platform ??= SDKConfiguration.Platform;
-            request.DeviceNickname ??= SDKConfiguration.DeviceNickname;
 
+                    payload.RawResponse = httpResponse;
+                    throw new GetTokenDetailsUnauthorized(payload, httpResponse, httpResponseBody);
+                }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+
+            throw new Models.Errors.SDKException("Unknown status code received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+        }
+
+        public async Task<PostUsersSignInDataResponse> PostUsersSignInDataAsync(PostUsersSignInDataRequest request, string? serverUrl = null)
+        {
             string baseUrl = Utilities.TemplateUrl(PostUsersSignInDataServerList[0], new Dictionary<string, string>(){
             });
             if (serverUrl != null)
@@ -515,7 +485,7 @@ namespace LukeHagar.PlexAPI.SDK
             var urlString = baseUrl + "/users/signin";
 
             var httpRequest = new HttpRequestMessage(HttpMethod.Post, urlString);
-            httpRequest.Headers.Add("user-agent", _userAgent);
+            httpRequest.Headers.Add("user-agent", SDKConfiguration.UserAgent);
             HeaderSerializer.PopulateHeaders(ref httpRequest, request);
 
             var serializedBody = RequestBodySerializer.Serialize(request, "RequestBody", "form", false, true);
@@ -524,47 +494,14 @@ namespace LukeHagar.PlexAPI.SDK
                 httpRequest.Content = serializedBody;
             }
 
-            var hookCtx = new HookContext("post-users-sign-in-data", null, null);
+            var hookCtx = new HookContext(SDKConfiguration, baseUrl, "post-users-sign-in-data", new List<string> {  }, null);
 
             httpRequest = await this.SDKConfiguration.Hooks.BeforeRequestAsync(new BeforeRequestContext(hookCtx), httpRequest);
-            if (retryConfig == null)
-            {
-                if (this.SDKConfiguration.RetryConfig != null)
-                {
-                    retryConfig = this.SDKConfiguration.RetryConfig;
-                }
-                else
-                {
-                    var backoff = new BackoffStrategy(
-                        initialIntervalMs: 500L,
-                        maxIntervalMs: 60000L,
-                        maxElapsedTimeMs: 3600000L,
-                        exponent: 1.5
-                    );
-                    retryConfig = new RetryConfig(
-                        strategy: RetryConfig.RetryStrategy.BACKOFF,
-                        backoff: backoff,
-                        retryConnectionErrors: true
-                    );
-                }
-            }
-
-            List<string> statusCodes = new List<string>
-            {
-                "5XX",
-            };
-
-            Func<Task<HttpResponseMessage>> retrySend = async () =>
-            {
-                var _httpRequest = await _client.CloneAsync(httpRequest);
-                return await _client.SendAsync(_httpRequest);
-            };
-            var retries = new LukeHagar.PlexAPI.SDK.Utils.Retries.Retries(retrySend, retryConfig, statusCodes);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await retries.Run();
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -597,7 +534,17 @@ namespace LukeHagar.PlexAPI.SDK
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<PostUsersSignInDataUserPlexAccount>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Include);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    PostUsersSignInDataUserPlexAccount obj;
+                    try
+                    {
+                        obj = ResponseBodyDeserializer.DeserializeNotNull<PostUsersSignInDataUserPlexAccount>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into PostUsersSignInDataUserPlexAccount.", httpResponse, httpResponseBody, ex);
+                    }
+
                     var response = new PostUsersSignInDataResponse()
                     {
                         StatusCode = responseStatusCode,
@@ -608,36 +555,60 @@ namespace LukeHagar.PlexAPI.SDK
                     return response;
                 }
 
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
             else if(responseStatusCode == 400)
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<PostUsersSignInDataBadRequest>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Include);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    PostUsersSignInDataBadRequestPayload payload;
-                    throw obj!;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<PostUsersSignInDataBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into PostUsersSignInDataBadRequestPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new PostUsersSignInDataBadRequest(payload, httpResponse, httpResponseBody);
+                }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
             else if(responseStatusCode == 401)
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<PostUsersSignInDataUnauthorized>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Include);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    PostUsersSignInDataUnauthorizedPayload payload;
-                    throw obj!;
+                    try
-                }
-
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
-            }
-            else if(responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
                     {
-                throw new Models.Errors.SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<PostUsersSignInDataUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into PostUsersSignInDataUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-            throw new Models.Errors.SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new PostUsersSignInDataUnauthorized(payload, httpResponse, httpResponseBody);
+                }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+
+            throw new Models.Errors.SDKException("Unknown status code received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
         }
     }
 }

LukeHagar/PlexAPI/SDK/Butler.cs

@@ -13,14 +13,16 @@ namespace LukeHagar.PlexAPI.SDK
     using LukeHagar.PlexAPI.SDK.Models.Components;
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Models.Requests;
-    using LukeHagar.PlexAPI.SDK.Utils.Retries;
     using LukeHagar.PlexAPI.SDK.Utils;
+    using LukeHagar.PlexAPI.SDK.Utils.Retries;
     using Newtonsoft.Json;
-    using System.Collections.Generic;
-    using System.Net.Http.Headers;
-    using System.Net.Http;
-    using System.Threading.Tasks;
     using System;
+    using System.Collections.Concurrent;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Net.Http;
+    using System.Net.Http.Headers;
+    using System.Threading.Tasks;
 
     /// <summary>
     /// Butler is the task manager of the Plex Media Server Ecosystem.<br/>
@@ -39,7 +41,7 @@ namespace LukeHagar.PlexAPI.SDK
         /// Returns a list of butler tasks
         /// </remarks>
         /// </summary>
-        Task<GetButlerTasksResponse> GetButlerTasksAsync(RetryConfig? retryConfig = null);
+        Task<GetButlerTasksResponse> GetButlerTasksAsync();
 
         /// <summary>
         /// Start all Butler tasks
@@ -53,7 +55,7 @@ namespace LukeHagar.PlexAPI.SDK
         /// 
         /// </remarks>
         /// </summary>
-        Task<StartAllTasksResponse> StartAllTasksAsync(RetryConfig? retryConfig = null);
+        Task<StartAllTasksResponse> StartAllTasksAsync();
 
         /// <summary>
         /// Stop all Butler tasks
@@ -63,7 +65,7 @@ namespace LukeHagar.PlexAPI.SDK
         /// 
         /// </remarks>
         /// </summary>
-        Task<StopAllTasksResponse> StopAllTasksAsync(RetryConfig? retryConfig = null);
+        Task<StopAllTasksResponse> StopAllTasksAsync();
 
         /// <summary>
         /// Start a single Butler task
@@ -77,7 +79,7 @@ namespace LukeHagar.PlexAPI.SDK
         /// 
         /// </remarks>
         /// </summary>
-        Task<StartTaskResponse> StartTaskAsync(TaskName taskName, RetryConfig? retryConfig = null);
+        Task<StartTaskResponse> StartTaskAsync(TaskName taskName);
 
         /// <summary>
         /// Stop a single Butler task
@@ -87,7 +89,7 @@ namespace LukeHagar.PlexAPI.SDK
         /// 
         /// </remarks>
         /// </summary>
-        Task<StopTaskResponse> StopTaskAsync(PathParamTaskName taskName, RetryConfig? retryConfig = null);
+        Task<StopTaskResponse> StopTaskAsync(PathParamTaskName taskName);
     }
 
     /// <summary>
@@ -101,77 +103,37 @@ namespace LukeHagar.PlexAPI.SDK
     {
         public SDKConfig SDKConfiguration { get; private set; }
         private const string _language = "csharp";
-        private const string _sdkVersion = "0.9.0";
+        private const string _sdkVersion = "0.17.0";
-        private const string _sdkGenVersion = "2.429.0";
+        private const string _sdkGenVersion = "2.698.4";
         private const string _openapiDocVersion = "0.0.3";
-        private const string _userAgent = "speakeasy-sdk/csharp 0.9.0 2.429.0 0.0.3 LukeHagar.PlexAPI.SDK";
-        private string _serverUrl = "";
-        private ISpeakeasyHttpClient _client;
-        private Func<LukeHagar.PlexAPI.SDK.Models.Components.Security>? _securitySource;
 
-        public Butler(ISpeakeasyHttpClient client, Func<LukeHagar.PlexAPI.SDK.Models.Components.Security>? securitySource, string serverUrl, SDKConfig config)
+        public Butler(SDKConfig config)
         {
-            _client = client;
-            _securitySource = securitySource;
-            _serverUrl = serverUrl;
             SDKConfiguration = config;
         }
 
-        public async Task<GetButlerTasksResponse> GetButlerTasksAsync(RetryConfig? retryConfig = null)
+        public async Task<GetButlerTasksResponse> GetButlerTasksAsync()
         {
             string baseUrl = this.SDKConfiguration.GetTemplatedServerUrl();
 
             var urlString = baseUrl + "/butler";
 
             var httpRequest = new HttpRequestMessage(HttpMethod.Get, urlString);
-            httpRequest.Headers.Add("user-agent", _userAgent);
+            httpRequest.Headers.Add("user-agent", SDKConfiguration.UserAgent);
 
-            if (_securitySource != null)
+            if (SDKConfiguration.SecuritySource != null)
             {
-                httpRequest = new SecurityMetadata(_securitySource).Apply(httpRequest);
+                httpRequest = new SecurityMetadata(SDKConfiguration.SecuritySource).Apply(httpRequest);
             }
 
-            var hookCtx = new HookContext("getButlerTasks", null, _securitySource);
+            var hookCtx = new HookContext(SDKConfiguration, baseUrl, "getButlerTasks", new List<string> {  }, SDKConfiguration.SecuritySource);
 
             httpRequest = await this.SDKConfiguration.Hooks.BeforeRequestAsync(new BeforeRequestContext(hookCtx), httpRequest);
-            if (retryConfig == null)
-            {
-                if (this.SDKConfiguration.RetryConfig != null)
-                {
-                    retryConfig = this.SDKConfiguration.RetryConfig;
-                }
-                else
-                {
-                    var backoff = new BackoffStrategy(
-                        initialIntervalMs: 500L,
-                        maxIntervalMs: 60000L,
-                        maxElapsedTimeMs: 3600000L,
-                        exponent: 1.5
-                    );
-                    retryConfig = new RetryConfig(
-                        strategy: RetryConfig.RetryStrategy.BACKOFF,
-                        backoff: backoff,
-                        retryConnectionErrors: true
-                    );
-                }
-            }
-
-            List<string> statusCodes = new List<string>
-            {
-                "5XX",
-            };
-
-            Func<Task<HttpResponseMessage>> retrySend = async () =>
-            {
-                var _httpRequest = await _client.CloneAsync(httpRequest);
-                return await _client.SendAsync(_httpRequest);
-            };
-            var retries = new LukeHagar.PlexAPI.SDK.Utils.Retries.Retries(retrySend, retryConfig, statusCodes);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await retries.Run();
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -204,7 +166,17 @@ namespace LukeHagar.PlexAPI.SDK
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<GetButlerTasksResponseBody>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    GetButlerTasksResponseBody obj;
+                    try
+                    {
+                        obj = ResponseBodyDeserializer.DeserializeNotNull<GetButlerTasksResponseBody>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetButlerTasksResponseBody.", httpResponse, httpResponseBody, ex);
+                    }
+
                     var response = new GetButlerTasksResponse()
                     {
                         StatusCode = responseStatusCode,
@@ -215,93 +187,84 @@ namespace LukeHagar.PlexAPI.SDK
                     return response;
                 }
 
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
             else if(responseStatusCode == 400)
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<GetButlerTasksBadRequest>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    GetButlerTasksBadRequestPayload payload;
-                    throw obj!;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetButlerTasksBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetButlerTasksBadRequestPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new GetButlerTasksBadRequest(payload, httpResponse, httpResponseBody);
+                }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
             else if(responseStatusCode == 401)
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<GetButlerTasksUnauthorized>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    GetButlerTasksUnauthorizedPayload payload;
-                    throw obj!;
+                    try
-                }
-
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
-            }
-            else if(responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
                     {
-                throw new Models.Errors.SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetButlerTasksUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetButlerTasksUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-            throw new Models.Errors.SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new GetButlerTasksUnauthorized(payload, httpResponse, httpResponseBody);
                 }
 
-        public async Task<StartAllTasksResponse> StartAllTasksAsync(RetryConfig? retryConfig = null)
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+
+            throw new Models.Errors.SDKException("Unknown status code received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+        }
+
+        public async Task<StartAllTasksResponse> StartAllTasksAsync()
         {
             string baseUrl = this.SDKConfiguration.GetTemplatedServerUrl();
 
             var urlString = baseUrl + "/butler";
 
             var httpRequest = new HttpRequestMessage(HttpMethod.Post, urlString);
-            httpRequest.Headers.Add("user-agent", _userAgent);
+            httpRequest.Headers.Add("user-agent", SDKConfiguration.UserAgent);
 
-            if (_securitySource != null)
+            if (SDKConfiguration.SecuritySource != null)
             {
-                httpRequest = new SecurityMetadata(_securitySource).Apply(httpRequest);
+                httpRequest = new SecurityMetadata(SDKConfiguration.SecuritySource).Apply(httpRequest);
             }
 
-            var hookCtx = new HookContext("startAllTasks", null, _securitySource);
+            var hookCtx = new HookContext(SDKConfiguration, baseUrl, "startAllTasks", new List<string> {  }, SDKConfiguration.SecuritySource);
 
             httpRequest = await this.SDKConfiguration.Hooks.BeforeRequestAsync(new BeforeRequestContext(hookCtx), httpRequest);
-            if (retryConfig == null)
-            {
-                if (this.SDKConfiguration.RetryConfig != null)
-                {
-                    retryConfig = this.SDKConfiguration.RetryConfig;
-                }
-                else
-                {
-                    var backoff = new BackoffStrategy(
-                        initialIntervalMs: 500L,
-                        maxIntervalMs: 60000L,
-                        maxElapsedTimeMs: 3600000L,
-                        exponent: 1.5
-                    );
-                    retryConfig = new RetryConfig(
-                        strategy: RetryConfig.RetryStrategy.BACKOFF,
-                        backoff: backoff,
-                        retryConnectionErrors: true
-                    );
-                }
-            }
-
-            List<string> statusCodes = new List<string>
-            {
-                "5XX",
-            };
-
-            Func<Task<HttpResponseMessage>> retrySend = async () =>
-            {
-                var _httpRequest = await _client.CloneAsync(httpRequest);
-                return await _client.SendAsync(_httpRequest);
-            };
-            var retries = new LukeHagar.PlexAPI.SDK.Utils.Retries.Retries(retrySend, retryConfig, statusCodes);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await retries.Run();
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -343,87 +306,78 @@ namespace LukeHagar.PlexAPI.SDK
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<StartAllTasksBadRequest>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    StartAllTasksBadRequestPayload payload;
-                    throw obj!;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<StartAllTasksBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into StartAllTasksBadRequestPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new StartAllTasksBadRequest(payload, httpResponse, httpResponseBody);
+                }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
             else if(responseStatusCode == 401)
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<StartAllTasksUnauthorized>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    StartAllTasksUnauthorizedPayload payload;
-                    throw obj!;
+                    try
-                }
-
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
-            }
-            else if(responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
                     {
-                throw new Models.Errors.SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<StartAllTasksUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into StartAllTasksUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-            throw new Models.Errors.SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new StartAllTasksUnauthorized(payload, httpResponse, httpResponseBody);
                 }
 
-        public async Task<StopAllTasksResponse> StopAllTasksAsync(RetryConfig? retryConfig = null)
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+
+            throw new Models.Errors.SDKException("Unknown status code received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+        }
+
+        public async Task<StopAllTasksResponse> StopAllTasksAsync()
         {
             string baseUrl = this.SDKConfiguration.GetTemplatedServerUrl();
 
             var urlString = baseUrl + "/butler";
 
             var httpRequest = new HttpRequestMessage(HttpMethod.Delete, urlString);
-            httpRequest.Headers.Add("user-agent", _userAgent);
+            httpRequest.Headers.Add("user-agent", SDKConfiguration.UserAgent);
 
-            if (_securitySource != null)
+            if (SDKConfiguration.SecuritySource != null)
             {
-                httpRequest = new SecurityMetadata(_securitySource).Apply(httpRequest);
+                httpRequest = new SecurityMetadata(SDKConfiguration.SecuritySource).Apply(httpRequest);
             }
 
-            var hookCtx = new HookContext("stopAllTasks", null, _securitySource);
+            var hookCtx = new HookContext(SDKConfiguration, baseUrl, "stopAllTasks", new List<string> {  }, SDKConfiguration.SecuritySource);
 
             httpRequest = await this.SDKConfiguration.Hooks.BeforeRequestAsync(new BeforeRequestContext(hookCtx), httpRequest);
-            if (retryConfig == null)
-            {
-                if (this.SDKConfiguration.RetryConfig != null)
-                {
-                    retryConfig = this.SDKConfiguration.RetryConfig;
-                }
-                else
-                {
-                    var backoff = new BackoffStrategy(
-                        initialIntervalMs: 500L,
-                        maxIntervalMs: 60000L,
-                        maxElapsedTimeMs: 3600000L,
-                        exponent: 1.5
-                    );
-                    retryConfig = new RetryConfig(
-                        strategy: RetryConfig.RetryStrategy.BACKOFF,
-                        backoff: backoff,
-                        retryConnectionErrors: true
-                    );
-                }
-            }
-
-            List<string> statusCodes = new List<string>
-            {
-                "5XX",
-            };
-
-            Func<Task<HttpResponseMessage>> retrySend = async () =>
-            {
-                var _httpRequest = await _client.CloneAsync(httpRequest);
-                return await _client.SendAsync(_httpRequest);
-            };
-            var retries = new LukeHagar.PlexAPI.SDK.Utils.Retries.Retries(retrySend, retryConfig, statusCodes);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await retries.Run();
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -465,33 +419,57 @@ namespace LukeHagar.PlexAPI.SDK
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<StopAllTasksBadRequest>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    StopAllTasksBadRequestPayload payload;
-                    throw obj!;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<StopAllTasksBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into StopAllTasksBadRequestPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new StopAllTasksBadRequest(payload, httpResponse, httpResponseBody);
+                }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
             else if(responseStatusCode == 401)
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<StopAllTasksUnauthorized>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    StopAllTasksUnauthorizedPayload payload;
-                    throw obj!;
+                    try
-                }
-
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
-            }
-            else if(responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
                     {
-                throw new Models.Errors.SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<StopAllTasksUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into StopAllTasksUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-            throw new Models.Errors.SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new StopAllTasksUnauthorized(payload, httpResponse, httpResponseBody);
                 }
 
-        public async Task<StartTaskResponse> StartTaskAsync(TaskName taskName, RetryConfig? retryConfig = null)
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+
+            throw new Models.Errors.SDKException("Unknown status code received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+        }
+
+        public async Task<StartTaskResponse> StartTaskAsync(TaskName taskName)
         {
             var request = new StartTaskRequest()
             {
@@ -501,54 +479,21 @@ namespace LukeHagar.PlexAPI.SDK
             var urlString = URLBuilder.Build(baseUrl, "/butler/{taskName}", request);
 
             var httpRequest = new HttpRequestMessage(HttpMethod.Post, urlString);
-            httpRequest.Headers.Add("user-agent", _userAgent);
+            httpRequest.Headers.Add("user-agent", SDKConfiguration.UserAgent);
 
-            if (_securitySource != null)
+            if (SDKConfiguration.SecuritySource != null)
             {
-                httpRequest = new SecurityMetadata(_securitySource).Apply(httpRequest);
+                httpRequest = new SecurityMetadata(SDKConfiguration.SecuritySource).Apply(httpRequest);
             }
 
-            var hookCtx = new HookContext("startTask", null, _securitySource);
+            var hookCtx = new HookContext(SDKConfiguration, baseUrl, "startTask", new List<string> {  }, SDKConfiguration.SecuritySource);
 
             httpRequest = await this.SDKConfiguration.Hooks.BeforeRequestAsync(new BeforeRequestContext(hookCtx), httpRequest);
-            if (retryConfig == null)
-            {
-                if (this.SDKConfiguration.RetryConfig != null)
-                {
-                    retryConfig = this.SDKConfiguration.RetryConfig;
-                }
-                else
-                {
-                    var backoff = new BackoffStrategy(
-                        initialIntervalMs: 500L,
-                        maxIntervalMs: 60000L,
-                        maxElapsedTimeMs: 3600000L,
-                        exponent: 1.5
-                    );
-                    retryConfig = new RetryConfig(
-                        strategy: RetryConfig.RetryStrategy.BACKOFF,
-                        backoff: backoff,
-                        retryConnectionErrors: true
-                    );
-                }
-            }
-
-            List<string> statusCodes = new List<string>
-            {
-                "5XX",
-            };
-
-            Func<Task<HttpResponseMessage>> retrySend = async () =>
-            {
-                var _httpRequest = await _client.CloneAsync(httpRequest);
-                return await _client.SendAsync(_httpRequest);
-            };
-            var retries = new LukeHagar.PlexAPI.SDK.Utils.Retries.Retries(retrySend, retryConfig, statusCodes);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await retries.Run();
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -590,33 +535,57 @@ namespace LukeHagar.PlexAPI.SDK
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<StartTaskBadRequest>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    StartTaskBadRequestPayload payload;
-                    throw obj!;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<StartTaskBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into StartTaskBadRequestPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new StartTaskBadRequest(payload, httpResponse, httpResponseBody);
+                }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
             else if(responseStatusCode == 401)
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<StartTaskUnauthorized>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    StartTaskUnauthorizedPayload payload;
-                    throw obj!;
+                    try
-                }
-
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
-            }
-            else if(responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
                     {
-                throw new Models.Errors.SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<StartTaskUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into StartTaskUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-            throw new Models.Errors.SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new StartTaskUnauthorized(payload, httpResponse, httpResponseBody);
                 }
 
-        public async Task<StopTaskResponse> StopTaskAsync(PathParamTaskName taskName, RetryConfig? retryConfig = null)
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+
+            throw new Models.Errors.SDKException("Unknown status code received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+        }
+
+        public async Task<StopTaskResponse> StopTaskAsync(PathParamTaskName taskName)
         {
             var request = new StopTaskRequest()
             {
@@ -626,54 +595,21 @@ namespace LukeHagar.PlexAPI.SDK
             var urlString = URLBuilder.Build(baseUrl, "/butler/{taskName}", request);
 
             var httpRequest = new HttpRequestMessage(HttpMethod.Delete, urlString);
-            httpRequest.Headers.Add("user-agent", _userAgent);
+            httpRequest.Headers.Add("user-agent", SDKConfiguration.UserAgent);
 
-            if (_securitySource != null)
+            if (SDKConfiguration.SecuritySource != null)
             {
-                httpRequest = new SecurityMetadata(_securitySource).Apply(httpRequest);
+                httpRequest = new SecurityMetadata(SDKConfiguration.SecuritySource).Apply(httpRequest);
             }
 
-            var hookCtx = new HookContext("stopTask", null, _securitySource);
+            var hookCtx = new HookContext(SDKConfiguration, baseUrl, "stopTask", new List<string> {  }, SDKConfiguration.SecuritySource);
 
             httpRequest = await this.SDKConfiguration.Hooks.BeforeRequestAsync(new BeforeRequestContext(hookCtx), httpRequest);
-            if (retryConfig == null)
-            {
-                if (this.SDKConfiguration.RetryConfig != null)
-                {
-                    retryConfig = this.SDKConfiguration.RetryConfig;
-                }
-                else
-                {
-                    var backoff = new BackoffStrategy(
-                        initialIntervalMs: 500L,
-                        maxIntervalMs: 60000L,
-                        maxElapsedTimeMs: 3600000L,
-                        exponent: 1.5
-                    );
-                    retryConfig = new RetryConfig(
-                        strategy: RetryConfig.RetryStrategy.BACKOFF,
-                        backoff: backoff,
-                        retryConnectionErrors: true
-                    );
-                }
-            }
-
-            List<string> statusCodes = new List<string>
-            {
-                "5XX",
-            };
-
-            Func<Task<HttpResponseMessage>> retrySend = async () =>
-            {
-                var _httpRequest = await _client.CloneAsync(httpRequest);
-                return await _client.SendAsync(_httpRequest);
-            };
-            var retries = new LukeHagar.PlexAPI.SDK.Utils.Retries.Retries(retrySend, retryConfig, statusCodes);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await retries.Run();
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode == 404 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -715,30 +651,54 @@ namespace LukeHagar.PlexAPI.SDK
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<StopTaskBadRequest>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    StopTaskBadRequestPayload payload;
-                    throw obj!;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<StopTaskBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into StopTaskBadRequestPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new StopTaskBadRequest(payload, httpResponse, httpResponseBody);
+                }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
             else if(responseStatusCode == 401)
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<StopTaskUnauthorized>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    StopTaskUnauthorizedPayload payload;
-                    throw obj!;
+                    try
-                }
-
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
-            }
-            else if(responseStatusCode == 404 || responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
                     {
-                throw new Models.Errors.SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<StopTaskUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into StopTaskUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-            throw new Models.Errors.SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new StopTaskUnauthorized(payload, httpResponse, httpResponseBody);
+                }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode == 404 || responseStatusCode >= 400 && responseStatusCode < 500)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+
+            throw new Models.Errors.SDKException("Unknown status code received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
         }
     }
 }

LukeHagar/PlexAPI/SDK/Hooks/HookTypes.cs

@@ -17,34 +17,47 @@ namespace LukeHagar.PlexAPI.SDK.Hooks
 
     public class HookContext
     {
+        public SDKConfig SDKConfiguration { get; set; }
+        public string BaseURL { get; set; } = "";
         public string OperationID { get; set; }
         public List<string>? Oauth2Scopes { get; set; }
         public Func<object>? SecuritySource { get; set; }
 
-        public HookContext(string operationID, List<string>? oauth2Scopes, Func<object>? securitySource)
+        public HookContext(SDKConfig config, string baseURL, string operationID, List<string>? oauth2Scopes, Func<object>? securitySource)
         {
+            SDKConfiguration = config;
+            BaseURL = baseURL;
             OperationID = operationID;
             Oauth2Scopes = oauth2Scopes;
             SecuritySource = securitySource;
         }
+
+        public HookContext(HookContext hookCtx)
+        {
+            SDKConfiguration = hookCtx.SDKConfiguration;
+            BaseURL = hookCtx.BaseURL;
+            OperationID = hookCtx.OperationID;
+            Oauth2Scopes = hookCtx.Oauth2Scopes;
+            SecuritySource = hookCtx.SecuritySource;
+        }
     }
 
     public class BeforeRequestContext : HookContext
     {
         public BeforeRequestContext(HookContext hookCtx)
-            : base(hookCtx.OperationID, hookCtx.Oauth2Scopes, hookCtx.SecuritySource) { }
+            : base(hookCtx) { }
     }
 
     public class AfterSuccessContext : HookContext
     {
         public AfterSuccessContext(HookContext hookCtx)
-            : base(hookCtx.OperationID, hookCtx.Oauth2Scopes, hookCtx.SecuritySource) { }
+            : base(hookCtx) { }
     }
 
     public class AfterErrorContext : HookContext
     {
         public AfterErrorContext(HookContext hookCtx)
-            : base(hookCtx.OperationID, hookCtx.Oauth2Scopes, hookCtx.SecuritySource) { }
+            : base(hookCtx) { }
     }
 
     /// <summary>

LukeHagar/PlexAPI/SDK/Hubs.cs

@@ -13,14 +13,14 @@ namespace LukeHagar.PlexAPI.SDK
     using LukeHagar.PlexAPI.SDK.Models.Components;
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Models.Requests;
-    using LukeHagar.PlexAPI.SDK.Utils.Retries;
     using LukeHagar.PlexAPI.SDK.Utils;
+    using LukeHagar.PlexAPI.SDK.Utils.Retries;
     using Newtonsoft.Json;
-    using System.Collections.Generic;
-    using System.Net.Http.Headers;
-    using System.Net.Http;
-    using System.Threading.Tasks;
     using System;
+    using System.Collections.Generic;
+    using System.Net.Http;
+    using System.Net.Http.Headers;
+    using System.Threading.Tasks;
 
     /// <summary>
     /// Hubs are a structured two-dimensional container for media, generally represented by multiple horizontal rows.<br/>
@@ -39,7 +39,7 @@ namespace LukeHagar.PlexAPI.SDK
         /// Get Global Hubs filtered by the parameters provided.
         /// </remarks>
         /// </summary>
-        Task<GetGlobalHubsResponse> GetGlobalHubsAsync(double? count = null, OnlyTransient? onlyTransient = null, RetryConfig? retryConfig = null);
+        Task<GetGlobalHubsResponse> GetGlobalHubsAsync(double? count = null, OnlyTransient? onlyTransient = null);
 
         /// <summary>
         /// Get Recently Added
@@ -49,7 +49,7 @@ namespace LukeHagar.PlexAPI.SDK
         /// 
         /// </remarks>
         /// </summary>
-        Task<GetRecentlyAddedResponse> GetRecentlyAddedAsync(GetRecentlyAddedRequest request, RetryConfig? retryConfig = null);
+        Task<GetRecentlyAddedResponse> GetRecentlyAddedAsync(GetRecentlyAddedRequest request);
 
         /// <summary>
         /// Get library specific hubs
@@ -59,7 +59,7 @@ namespace LukeHagar.PlexAPI.SDK
         /// 
         /// </remarks>
         /// </summary>
-        Task<GetLibraryHubsResponse> GetLibraryHubsAsync(double sectionId, double? count = null, QueryParamOnlyTransient? onlyTransient = null, RetryConfig? retryConfig = null);
+        Task<GetLibraryHubsResponse> GetLibraryHubsAsync(double sectionId, double? count = null, QueryParamOnlyTransient? onlyTransient = null);
     }
 
     /// <summary>
@@ -73,23 +73,16 @@ namespace LukeHagar.PlexAPI.SDK
     {
         public SDKConfig SDKConfiguration { get; private set; }
         private const string _language = "csharp";
-        private const string _sdkVersion = "0.9.0";
+        private const string _sdkVersion = "0.17.0";
-        private const string _sdkGenVersion = "2.429.0";
+        private const string _sdkGenVersion = "2.698.4";
         private const string _openapiDocVersion = "0.0.3";
-        private const string _userAgent = "speakeasy-sdk/csharp 0.9.0 2.429.0 0.0.3 LukeHagar.PlexAPI.SDK";
-        private string _serverUrl = "";
-        private ISpeakeasyHttpClient _client;
-        private Func<LukeHagar.PlexAPI.SDK.Models.Components.Security>? _securitySource;
 
-        public Hubs(ISpeakeasyHttpClient client, Func<LukeHagar.PlexAPI.SDK.Models.Components.Security>? securitySource, string serverUrl, SDKConfig config)
+        public Hubs(SDKConfig config)
         {
-            _client = client;
-            _securitySource = securitySource;
-            _serverUrl = serverUrl;
             SDKConfiguration = config;
         }
 
-        public async Task<GetGlobalHubsResponse> GetGlobalHubsAsync(double? count = null, OnlyTransient? onlyTransient = null, RetryConfig? retryConfig = null)
+        public async Task<GetGlobalHubsResponse> GetGlobalHubsAsync(double? count = null, OnlyTransient? onlyTransient = null)
         {
             var request = new GetGlobalHubsRequest()
             {
@@ -100,54 +93,21 @@ namespace LukeHagar.PlexAPI.SDK
             var urlString = URLBuilder.Build(baseUrl, "/hubs", request);
 
             var httpRequest = new HttpRequestMessage(HttpMethod.Get, urlString);
-            httpRequest.Headers.Add("user-agent", _userAgent);
+            httpRequest.Headers.Add("user-agent", SDKConfiguration.UserAgent);
 
-            if (_securitySource != null)
+            if (SDKConfiguration.SecuritySource != null)
             {
-                httpRequest = new SecurityMetadata(_securitySource).Apply(httpRequest);
+                httpRequest = new SecurityMetadata(SDKConfiguration.SecuritySource).Apply(httpRequest);
             }
 
-            var hookCtx = new HookContext("getGlobalHubs", null, _securitySource);
+            var hookCtx = new HookContext(SDKConfiguration, baseUrl, "getGlobalHubs", new List<string> {  }, SDKConfiguration.SecuritySource);
 
             httpRequest = await this.SDKConfiguration.Hooks.BeforeRequestAsync(new BeforeRequestContext(hookCtx), httpRequest);
-            if (retryConfig == null)
-            {
-                if (this.SDKConfiguration.RetryConfig != null)
-                {
-                    retryConfig = this.SDKConfiguration.RetryConfig;
-                }
-                else
-                {
-                    var backoff = new BackoffStrategy(
-                        initialIntervalMs: 500L,
-                        maxIntervalMs: 60000L,
-                        maxElapsedTimeMs: 3600000L,
-                        exponent: 1.5
-                    );
-                    retryConfig = new RetryConfig(
-                        strategy: RetryConfig.RetryStrategy.BACKOFF,
-                        backoff: backoff,
-                        retryConnectionErrors: true
-                    );
-                }
-            }
-
-            List<string> statusCodes = new List<string>
-            {
-                "5XX",
-            };
-
-            Func<Task<HttpResponseMessage>> retrySend = async () =>
-            {
-                var _httpRequest = await _client.CloneAsync(httpRequest);
-                return await _client.SendAsync(_httpRequest);
-            };
-            var retries = new LukeHagar.PlexAPI.SDK.Utils.Retries.Retries(retrySend, retryConfig, statusCodes);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await retries.Run();
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -180,7 +140,17 @@ namespace LukeHagar.PlexAPI.SDK
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<GetGlobalHubsResponseBody>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Include);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    GetGlobalHubsResponseBody obj;
+                    try
+                    {
+                        obj = ResponseBodyDeserializer.DeserializeNotNull<GetGlobalHubsResponseBody>(httpResponseBody, NullValueHandling.Include);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetGlobalHubsResponseBody.", httpResponse, httpResponseBody, ex);
+                    }
+
                     var response = new GetGlobalHubsResponse()
                     {
                         StatusCode = responseStatusCode,
@@ -191,92 +161,83 @@ namespace LukeHagar.PlexAPI.SDK
                     return response;
                 }
 
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
             else if(responseStatusCode == 400)
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<GetGlobalHubsBadRequest>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Include);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    GetGlobalHubsBadRequestPayload payload;
-                    throw obj!;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetGlobalHubsBadRequestPayload>(httpResponseBody, NullValueHandling.Include);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetGlobalHubsBadRequestPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new GetGlobalHubsBadRequest(payload, httpResponse, httpResponseBody);
+                }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
             else if(responseStatusCode == 401)
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<GetGlobalHubsUnauthorized>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Include);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    GetGlobalHubsUnauthorizedPayload payload;
-                    throw obj!;
+                    try
-                }
-
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
-            }
-            else if(responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
                     {
-                throw new Models.Errors.SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetGlobalHubsUnauthorizedPayload>(httpResponseBody, NullValueHandling.Include);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetGlobalHubsUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-            throw new Models.Errors.SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new GetGlobalHubsUnauthorized(payload, httpResponse, httpResponseBody);
                 }
 
-        public async Task<GetRecentlyAddedResponse> GetRecentlyAddedAsync(GetRecentlyAddedRequest request, RetryConfig? retryConfig = null)
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+
+            throw new Models.Errors.SDKException("Unknown status code received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+        }
+
+        public async Task<GetRecentlyAddedResponse> GetRecentlyAddedAsync(GetRecentlyAddedRequest request)
         {
             string baseUrl = this.SDKConfiguration.GetTemplatedServerUrl();
             var urlString = URLBuilder.Build(baseUrl, "/hubs/home/recentlyAdded", request);
 
             var httpRequest = new HttpRequestMessage(HttpMethod.Get, urlString);
-            httpRequest.Headers.Add("user-agent", _userAgent);
+            httpRequest.Headers.Add("user-agent", SDKConfiguration.UserAgent);
 
-            if (_securitySource != null)
+            if (SDKConfiguration.SecuritySource != null)
             {
-                httpRequest = new SecurityMetadata(_securitySource).Apply(httpRequest);
+                httpRequest = new SecurityMetadata(SDKConfiguration.SecuritySource).Apply(httpRequest);
             }
 
-            var hookCtx = new HookContext("get-recently-added", null, _securitySource);
+            var hookCtx = new HookContext(SDKConfiguration, baseUrl, "get-recently-added", new List<string> {  }, SDKConfiguration.SecuritySource);
 
             httpRequest = await this.SDKConfiguration.Hooks.BeforeRequestAsync(new BeforeRequestContext(hookCtx), httpRequest);
-            if (retryConfig == null)
-            {
-                if (this.SDKConfiguration.RetryConfig != null)
-                {
-                    retryConfig = this.SDKConfiguration.RetryConfig;
-                }
-                else
-                {
-                    var backoff = new BackoffStrategy(
-                        initialIntervalMs: 500L,
-                        maxIntervalMs: 60000L,
-                        maxElapsedTimeMs: 3600000L,
-                        exponent: 1.5
-                    );
-                    retryConfig = new RetryConfig(
-                        strategy: RetryConfig.RetryStrategy.BACKOFF,
-                        backoff: backoff,
-                        retryConnectionErrors: true
-                    );
-                }
-            }
-
-            List<string> statusCodes = new List<string>
-            {
-                "5XX",
-            };
-
-            Func<Task<HttpResponseMessage>> retrySend = async () =>
-            {
-                var _httpRequest = await _client.CloneAsync(httpRequest);
-                return await _client.SendAsync(_httpRequest);
-            };
-            var retries = new LukeHagar.PlexAPI.SDK.Utils.Retries.Retries(retrySend, retryConfig, statusCodes);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await retries.Run();
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -309,7 +270,17 @@ namespace LukeHagar.PlexAPI.SDK
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<GetRecentlyAddedResponseBody>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    GetRecentlyAddedResponseBody obj;
+                    try
+                    {
+                        obj = ResponseBodyDeserializer.DeserializeNotNull<GetRecentlyAddedResponseBody>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetRecentlyAddedResponseBody.", httpResponse, httpResponseBody, ex);
+                    }
+
                     var response = new GetRecentlyAddedResponse()
                     {
                         StatusCode = responseStatusCode,
@@ -320,17 +291,21 @@ namespace LukeHagar.PlexAPI.SDK
                     return response;
                 }
 
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
-            else if(responseStatusCode == 400 || responseStatusCode == 401 || responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
+            else if(responseStatusCode == 400 || responseStatusCode == 401 || responseStatusCode >= 400 && responseStatusCode < 500)
             {
-                throw new Models.Errors.SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
 
-            throw new Models.Errors.SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+            throw new Models.Errors.SDKException("Unknown status code received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
         }
 
-        public async Task<GetLibraryHubsResponse> GetLibraryHubsAsync(double sectionId, double? count = null, QueryParamOnlyTransient? onlyTransient = null, RetryConfig? retryConfig = null)
+        public async Task<GetLibraryHubsResponse> GetLibraryHubsAsync(double sectionId, double? count = null, QueryParamOnlyTransient? onlyTransient = null)
         {
             var request = new GetLibraryHubsRequest()
             {
@@ -342,54 +317,21 @@ namespace LukeHagar.PlexAPI.SDK
             var urlString = URLBuilder.Build(baseUrl, "/hubs/sections/{sectionId}", request);
 
             var httpRequest = new HttpRequestMessage(HttpMethod.Get, urlString);
-            httpRequest.Headers.Add("user-agent", _userAgent);
+            httpRequest.Headers.Add("user-agent", SDKConfiguration.UserAgent);
 
-            if (_securitySource != null)
+            if (SDKConfiguration.SecuritySource != null)
             {
-                httpRequest = new SecurityMetadata(_securitySource).Apply(httpRequest);
+                httpRequest = new SecurityMetadata(SDKConfiguration.SecuritySource).Apply(httpRequest);
             }
 
-            var hookCtx = new HookContext("getLibraryHubs", null, _securitySource);
+            var hookCtx = new HookContext(SDKConfiguration, baseUrl, "getLibraryHubs", new List<string> {  }, SDKConfiguration.SecuritySource);
 
             httpRequest = await this.SDKConfiguration.Hooks.BeforeRequestAsync(new BeforeRequestContext(hookCtx), httpRequest);
-            if (retryConfig == null)
-            {
-                if (this.SDKConfiguration.RetryConfig != null)
-                {
-                    retryConfig = this.SDKConfiguration.RetryConfig;
-                }
-                else
-                {
-                    var backoff = new BackoffStrategy(
-                        initialIntervalMs: 500L,
-                        maxIntervalMs: 60000L,
-                        maxElapsedTimeMs: 3600000L,
-                        exponent: 1.5
-                    );
-                    retryConfig = new RetryConfig(
-                        strategy: RetryConfig.RetryStrategy.BACKOFF,
-                        backoff: backoff,
-                        retryConnectionErrors: true
-                    );
-                }
-            }
-
-            List<string> statusCodes = new List<string>
-            {
-                "5XX",
-            };
-
-            Func<Task<HttpResponseMessage>> retrySend = async () =>
-            {
-                var _httpRequest = await _client.CloneAsync(httpRequest);
-                return await _client.SendAsync(_httpRequest);
-            };
-            var retries = new LukeHagar.PlexAPI.SDK.Utils.Retries.Retries(retrySend, retryConfig, statusCodes);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await retries.Run();
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -422,7 +364,17 @@ namespace LukeHagar.PlexAPI.SDK
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<GetLibraryHubsResponseBody>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    GetLibraryHubsResponseBody obj;
+                    try
+                    {
+                        obj = ResponseBodyDeserializer.DeserializeNotNull<GetLibraryHubsResponseBody>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetLibraryHubsResponseBody.", httpResponse, httpResponseBody, ex);
+                    }
+
                     var response = new GetLibraryHubsResponse()
                     {
                         StatusCode = responseStatusCode,
@@ -433,36 +385,60 @@ namespace LukeHagar.PlexAPI.SDK
                     return response;
                 }
 
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
             else if(responseStatusCode == 400)
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<GetLibraryHubsBadRequest>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    GetLibraryHubsBadRequestPayload payload;
-                    throw obj!;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetLibraryHubsBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetLibraryHubsBadRequestPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new GetLibraryHubsBadRequest(payload, httpResponse, httpResponseBody);
+                }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
             else if(responseStatusCode == 401)
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<GetLibraryHubsUnauthorized>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    GetLibraryHubsUnauthorizedPayload payload;
-                    throw obj!;
+                    try
-                }
-
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
-            }
-            else if(responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
                     {
-                throw new Models.Errors.SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetLibraryHubsUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetLibraryHubsUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-            throw new Models.Errors.SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new GetLibraryHubsUnauthorized(payload, httpResponse, httpResponseBody);
+                }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+
+            throw new Models.Errors.SDKException("Unknown status code received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
         }
     }
 }

LukeHagar/PlexAPI/SDK/Log.cs

@@ -13,14 +13,16 @@ namespace LukeHagar.PlexAPI.SDK
     using LukeHagar.PlexAPI.SDK.Models.Components;
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Models.Requests;
-    using LukeHagar.PlexAPI.SDK.Utils.Retries;
     using LukeHagar.PlexAPI.SDK.Utils;
+    using LukeHagar.PlexAPI.SDK.Utils.Retries;
     using Newtonsoft.Json;
-    using System.Collections.Generic;
-    using System.Net.Http.Headers;
-    using System.Net.Http;
-    using System.Threading.Tasks;
     using System;
+    using System.Collections.Concurrent;
+    using System.Collections.Generic;
+    using System.Linq;
+    using System.Net.Http;
+    using System.Net.Http.Headers;
+    using System.Threading.Tasks;
 
     /// <summary>
     /// Submit logs to the Log Handler for Plex Media Server<br/>
@@ -40,7 +42,7 @@ namespace LukeHagar.PlexAPI.SDK
         /// 
         /// </remarks>
         /// </summary>
-        Task<LogLineResponse> LogLineAsync(Level level, string message, string source, RetryConfig? retryConfig = null);
+        Task<LogLineResponse> LogLineAsync(Level level, string message, string source);
 
         /// <summary>
         /// Logging a multi-line message
@@ -70,7 +72,7 @@ namespace LukeHagar.PlexAPI.SDK
         /// 
         /// </remarks>
         /// </summary>
-        Task<LogMultiLineResponse> LogMultiLineAsync(string request, RetryConfig? retryConfig = null);
+        Task<LogMultiLineResponse> LogMultiLineAsync(string request);
 
         /// <summary>
         /// Enabling Papertrail
@@ -80,7 +82,7 @@ namespace LukeHagar.PlexAPI.SDK
         /// 
         /// </remarks>
         /// </summary>
-        Task<EnablePaperTrailResponse> EnablePaperTrailAsync(RetryConfig? retryConfig = null);
+        Task<EnablePaperTrailResponse> EnablePaperTrailAsync();
     }
 
     /// <summary>
@@ -94,23 +96,16 @@ namespace LukeHagar.PlexAPI.SDK
     {
         public SDKConfig SDKConfiguration { get; private set; }
         private const string _language = "csharp";
-        private const string _sdkVersion = "0.9.0";
+        private const string _sdkVersion = "0.17.0";
-        private const string _sdkGenVersion = "2.429.0";
+        private const string _sdkGenVersion = "2.698.4";
         private const string _openapiDocVersion = "0.0.3";
-        private const string _userAgent = "speakeasy-sdk/csharp 0.9.0 2.429.0 0.0.3 LukeHagar.PlexAPI.SDK";
-        private string _serverUrl = "";
-        private ISpeakeasyHttpClient _client;
-        private Func<LukeHagar.PlexAPI.SDK.Models.Components.Security>? _securitySource;
 
-        public Log(ISpeakeasyHttpClient client, Func<LukeHagar.PlexAPI.SDK.Models.Components.Security>? securitySource, string serverUrl, SDKConfig config)
+        public Log(SDKConfig config)
         {
-            _client = client;
-            _securitySource = securitySource;
-            _serverUrl = serverUrl;
             SDKConfiguration = config;
         }
 
-        public async Task<LogLineResponse> LogLineAsync(Level level, string message, string source, RetryConfig? retryConfig = null)
+        public async Task<LogLineResponse> LogLineAsync(Level level, string message, string source)
         {
             var request = new LogLineRequest()
             {
@@ -122,54 +117,21 @@ namespace LukeHagar.PlexAPI.SDK
             var urlString = URLBuilder.Build(baseUrl, "/log", request);
 
             var httpRequest = new HttpRequestMessage(HttpMethod.Get, urlString);
-            httpRequest.Headers.Add("user-agent", _userAgent);
+            httpRequest.Headers.Add("user-agent", SDKConfiguration.UserAgent);
 
-            if (_securitySource != null)
+            if (SDKConfiguration.SecuritySource != null)
             {
-                httpRequest = new SecurityMetadata(_securitySource).Apply(httpRequest);
+                httpRequest = new SecurityMetadata(SDKConfiguration.SecuritySource).Apply(httpRequest);
             }
 
-            var hookCtx = new HookContext("logLine", null, _securitySource);
+            var hookCtx = new HookContext(SDKConfiguration, baseUrl, "logLine", new List<string> {  }, SDKConfiguration.SecuritySource);
 
             httpRequest = await this.SDKConfiguration.Hooks.BeforeRequestAsync(new BeforeRequestContext(hookCtx), httpRequest);
-            if (retryConfig == null)
-            {
-                if (this.SDKConfiguration.RetryConfig != null)
-                {
-                    retryConfig = this.SDKConfiguration.RetryConfig;
-                }
-                else
-                {
-                    var backoff = new BackoffStrategy(
-                        initialIntervalMs: 500L,
-                        maxIntervalMs: 60000L,
-                        maxElapsedTimeMs: 3600000L,
-                        exponent: 1.5
-                    );
-                    retryConfig = new RetryConfig(
-                        strategy: RetryConfig.RetryStrategy.BACKOFF,
-                        backoff: backoff,
-                        retryConnectionErrors: true
-                    );
-                }
-            }
-
-            List<string> statusCodes = new List<string>
-            {
-                "5XX",
-            };
-
-            Func<Task<HttpResponseMessage>> retrySend = async () =>
-            {
-                var _httpRequest = await _client.CloneAsync(httpRequest);
-                return await _client.SendAsync(_httpRequest);
-            };
-            var retries = new LukeHagar.PlexAPI.SDK.Utils.Retries.Retries(retrySend, retryConfig, statusCodes);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await retries.Run();
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -211,40 +173,64 @@ namespace LukeHagar.PlexAPI.SDK
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<LogLineBadRequest>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    LogLineBadRequestPayload payload;
-                    throw obj!;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<LogLineBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into LogLineBadRequestPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new LogLineBadRequest(payload, httpResponse, httpResponseBody);
+                }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
             else if(responseStatusCode == 401)
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<LogLineUnauthorized>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    LogLineUnauthorizedPayload payload;
-                    throw obj!;
+                    try
-                }
-
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
-            }
-            else if(responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
                     {
-                throw new Models.Errors.SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<LogLineUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into LogLineUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-            throw new Models.Errors.SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new LogLineUnauthorized(payload, httpResponse, httpResponseBody);
                 }
 
-        public async Task<LogMultiLineResponse> LogMultiLineAsync(string request, RetryConfig? retryConfig = null)
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+
+            throw new Models.Errors.SDKException("Unknown status code received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+        }
+
+        public async Task<LogMultiLineResponse> LogMultiLineAsync(string request)
         {
             string baseUrl = this.SDKConfiguration.GetTemplatedServerUrl();
 
             var urlString = baseUrl + "/log";
 
             var httpRequest = new HttpRequestMessage(HttpMethod.Post, urlString);
-            httpRequest.Headers.Add("user-agent", _userAgent);
+            httpRequest.Headers.Add("user-agent", SDKConfiguration.UserAgent);
 
             var serializedBody = RequestBodySerializer.Serialize(request, "Request", "string", false, false);
             if (serializedBody != null)
@@ -252,52 +238,19 @@ namespace LukeHagar.PlexAPI.SDK
                 httpRequest.Content = serializedBody;
             }
 
-            if (_securitySource != null)
+            if (SDKConfiguration.SecuritySource != null)
             {
-                httpRequest = new SecurityMetadata(_securitySource).Apply(httpRequest);
+                httpRequest = new SecurityMetadata(SDKConfiguration.SecuritySource).Apply(httpRequest);
             }
 
-            var hookCtx = new HookContext("logMultiLine", null, _securitySource);
+            var hookCtx = new HookContext(SDKConfiguration, baseUrl, "logMultiLine", new List<string> {  }, SDKConfiguration.SecuritySource);
 
             httpRequest = await this.SDKConfiguration.Hooks.BeforeRequestAsync(new BeforeRequestContext(hookCtx), httpRequest);
-            if (retryConfig == null)
-            {
-                if (this.SDKConfiguration.RetryConfig != null)
-                {
-                    retryConfig = this.SDKConfiguration.RetryConfig;
-                }
-                else
-                {
-                    var backoff = new BackoffStrategy(
-                        initialIntervalMs: 500L,
-                        maxIntervalMs: 60000L,
-                        maxElapsedTimeMs: 3600000L,
-                        exponent: 1.5
-                    );
-                    retryConfig = new RetryConfig(
-                        strategy: RetryConfig.RetryStrategy.BACKOFF,
-                        backoff: backoff,
-                        retryConnectionErrors: true
-                    );
-                }
-            }
-
-            List<string> statusCodes = new List<string>
-            {
-                "5XX",
-            };
-
-            Func<Task<HttpResponseMessage>> retrySend = async () =>
-            {
-                var _httpRequest = await _client.CloneAsync(httpRequest);
-                return await _client.SendAsync(_httpRequest);
-            };
-            var retries = new LukeHagar.PlexAPI.SDK.Utils.Retries.Retries(retrySend, retryConfig, statusCodes);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await retries.Run();
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -339,87 +292,78 @@ namespace LukeHagar.PlexAPI.SDK
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<LogMultiLineBadRequest>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    LogMultiLineBadRequestPayload payload;
-                    throw obj!;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<LogMultiLineBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into LogMultiLineBadRequestPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new LogMultiLineBadRequest(payload, httpResponse, httpResponseBody);
+                }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
             else if(responseStatusCode == 401)
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<LogMultiLineUnauthorized>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    LogMultiLineUnauthorizedPayload payload;
-                    throw obj!;
+                    try
-                }
-
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
-            }
-            else if(responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
                     {
-                throw new Models.Errors.SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<LogMultiLineUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into LogMultiLineUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-            throw new Models.Errors.SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new LogMultiLineUnauthorized(payload, httpResponse, httpResponseBody);
                 }
 
-        public async Task<EnablePaperTrailResponse> EnablePaperTrailAsync(RetryConfig? retryConfig = null)
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+
+            throw new Models.Errors.SDKException("Unknown status code received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+        }
+
+        public async Task<EnablePaperTrailResponse> EnablePaperTrailAsync()
         {
             string baseUrl = this.SDKConfiguration.GetTemplatedServerUrl();
 
             var urlString = baseUrl + "/log/networked";
 
             var httpRequest = new HttpRequestMessage(HttpMethod.Get, urlString);
-            httpRequest.Headers.Add("user-agent", _userAgent);
+            httpRequest.Headers.Add("user-agent", SDKConfiguration.UserAgent);
 
-            if (_securitySource != null)
+            if (SDKConfiguration.SecuritySource != null)
             {
-                httpRequest = new SecurityMetadata(_securitySource).Apply(httpRequest);
+                httpRequest = new SecurityMetadata(SDKConfiguration.SecuritySource).Apply(httpRequest);
             }
 
-            var hookCtx = new HookContext("enablePaperTrail", null, _securitySource);
+            var hookCtx = new HookContext(SDKConfiguration, baseUrl, "enablePaperTrail", new List<string> {  }, SDKConfiguration.SecuritySource);
 
             httpRequest = await this.SDKConfiguration.Hooks.BeforeRequestAsync(new BeforeRequestContext(hookCtx), httpRequest);
-            if (retryConfig == null)
-            {
-                if (this.SDKConfiguration.RetryConfig != null)
-                {
-                    retryConfig = this.SDKConfiguration.RetryConfig;
-                }
-                else
-                {
-                    var backoff = new BackoffStrategy(
-                        initialIntervalMs: 500L,
-                        maxIntervalMs: 60000L,
-                        maxElapsedTimeMs: 3600000L,
-                        exponent: 1.5
-                    );
-                    retryConfig = new RetryConfig(
-                        strategy: RetryConfig.RetryStrategy.BACKOFF,
-                        backoff: backoff,
-                        retryConnectionErrors: true
-                    );
-                }
-            }
-
-            List<string> statusCodes = new List<string>
-            {
-                "5XX",
-            };
-
-            Func<Task<HttpResponseMessage>> retrySend = async () =>
-            {
-                var _httpRequest = await _client.CloneAsync(httpRequest);
-                return await _client.SendAsync(_httpRequest);
-            };
-            var retries = new LukeHagar.PlexAPI.SDK.Utils.Retries.Retries(retrySend, retryConfig, statusCodes);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await retries.Run();
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode == 403 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -461,30 +405,54 @@ namespace LukeHagar.PlexAPI.SDK
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<EnablePaperTrailBadRequest>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    EnablePaperTrailBadRequestPayload payload;
-                    throw obj!;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<EnablePaperTrailBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into EnablePaperTrailBadRequestPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new EnablePaperTrailBadRequest(payload, httpResponse, httpResponseBody);
+                }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
             else if(responseStatusCode == 401)
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<EnablePaperTrailUnauthorized>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    EnablePaperTrailUnauthorizedPayload payload;
-                    throw obj!;
+                    try
-                }
-
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
-            }
-            else if(responseStatusCode == 403 || responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
                     {
-                throw new Models.Errors.SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<EnablePaperTrailUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into EnablePaperTrailUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-            throw new Models.Errors.SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new EnablePaperTrailUnauthorized(payload, httpResponse, httpResponseBody);
+                }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode == 403 || responseStatusCode >= 400 && responseStatusCode < 500)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+
+            throw new Models.Errors.SDKException("Unknown status code received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
         }
     }
 }

LukeHagar/PlexAPI/SDK/LukeHagar.PlexAPI.SDK.csproj

@@ -3,37 +3,37 @@
   <PropertyGroup>
     <IsPackable>true</IsPackable>
     <PackageId>LukeHagar.PlexAPI.SDK</PackageId>
-    <Version>0.9.0</Version>
+    <Version>0.17.0</Version>
     <TargetFramework>net8.0</TargetFramework>
     <Authors>LukeHagar</Authors>
-    <Copyright>Copyright (c) LukeHagar 2024</Copyright>
+    <Copyright>Copyright (c) LukeHagar 2025</Copyright>
     <RepositoryUrl>https://github.com/LukeHagar/plexcsharp.git</RepositoryUrl>
     <RepositoryType>git</RepositoryType>
     <PackageTags>Plex Media Server SDK</PackageTags>
-    <Description># Plex Media Server OpenAPI Specification
+    <Description># Plex Media Server OpenAPI Specification<br/>
-
+<br/>
-An Open Source OpenAPI Specification for Plex Media Server
+An Open Source OpenAPI Specification for Plex Media Server<br/>
-
+<br/>
-Automation and SDKs provided by [Speakeasy](https://speakeasyapi.dev/)
+Automation and SDKs provided by <a href="https://speakeasyapi.dev/">Speakeasy</a><br/>
-
+<br/>
-## Documentation
+## Documentation<br/>
-
+<br/>
-[API Documentation](https://plexapi.dev)
+<a href="https://plexapi.dev">API Documentation</a><br/>
-
+<br/>
-## SDKs
+## SDKs<br/>
-
+<br/>
-The following SDKs are generated from the OpenAPI Specification. They are automatically generated and may not be fully tested. If you find any issues, please open an issue on the [main specification Repository](https://github.com/LukeHagar/plex-api-spec).
+The following SDKs are generated from the OpenAPI Specification. They are automatically generated and may not be fully tested. If you find any issues, please open an issue on the <a href="https://github.com/LukeHagar/plex-api-spec">main specification Repository</a>.<br/>
-
+<br/>
-| Language              | Repository                                        | Releases                                                                                         | Other                                                   |
+| Language              | Repository                                        | Releases                                                                                         | Other                                                   |<br/>
-| --------------------- | ------------------------------------------------- | ------------------------------------------------------------------------------------------------ | ------------------------------------------------------- |
+| --------------------- | ------------------------------------------------- | ------------------------------------------------------------------------------------------------ | ------------------------------------------------------- |<br/>
-| Python                | [GitHub](https://github.com/LukeHagar/plexpy)     | [PyPI](https://pypi.org/project/plex-api-client/)                                                | -                                                       |
+| Python                | <a href="https://github.com/LukeHagar/plexpy">GitHub</a>     | <a href="https://pypi.org/project/plex-api-client/">PyPI</a>                                                | -                                                       |<br/>
-| JavaScript/TypeScript | [GitHub](https://github.com/LukeHagar/plexjs)     | [NPM](https://www.npmjs.com/package/@lukehagar/plexjs) \ [JSR](https://jsr.io/@lukehagar/plexjs) | -                                                       |
+| JavaScript/TypeScript | <a href="https://github.com/LukeHagar/plexjs">GitHub</a>     | <a href="https://www.npmjs.com/package/@lukehagar/plexjs">NPM</a> \ <a href="https://jsr.io/@lukehagar/plexjs">JSR</a> | -                                                       |<br/>
-| Go                    | [GitHub](https://github.com/LukeHagar/plexgo)     | [Releases](https://github.com/LukeHagar/plexgo/releases)                                         | [GoDoc](https://pkg.go.dev/github.com/LukeHagar/plexgo) |
+| Go                    | <a href="https://github.com/LukeHagar/plexgo">GitHub</a>     | <a href="https://github.com/LukeHagar/plexgo/releases">Releases</a>                                         | <a href="https://pkg.go.dev/github.com/LukeHagar/plexgo">GoDoc</a> |<br/>
-| Ruby                  | [GitHub](https://github.com/LukeHagar/plexruby)   | [Releases](https://github.com/LukeHagar/plexruby/releases)                                       | -                                                       |
+| Ruby                  | <a href="https://github.com/LukeHagar/plexruby">GitHub</a>   | <a href="https://github.com/LukeHagar/plexruby/releases">Releases</a>                                       | -                                                       |<br/>
-| Swift                 | [GitHub](https://github.com/LukeHagar/plexswift)  | [Releases](https://github.com/LukeHagar/plexswift/releases)                                      | -                                                       |
+| Swift                 | <a href="https://github.com/LukeHagar/plexswift">GitHub</a>  | <a href="https://github.com/LukeHagar/plexswift/releases">Releases</a>                                      | -                                                       |<br/>
-| PHP                   | [GitHub](https://github.com/LukeHagar/plexphp)    | [Releases](https://github.com/LukeHagar/plexphp/releases)                                        | -                                                       |
+| PHP                   | <a href="https://github.com/LukeHagar/plexphp">GitHub</a>    | <a href="https://github.com/LukeHagar/plexphp/releases">Releases</a>                                        | -                                                       |<br/>
-| Java                  | [GitHub](https://github.com/LukeHagar/plexjava)   | [Releases](https://github.com/LukeHagar/plexjava/releases)                                       | -                                                       |
+| Java                  | <a href="https://github.com/LukeHagar/plexjava">GitHub</a>   | <a href="https://github.com/LukeHagar/plexjava/releases">Releases</a>                                       | -                                                       |<br/>
-| C#                    | [GitHub](https://github.com/LukeHagar/plexcsharp) | [Releases](https://github.com/LukeHagar/plexcsharp/releases)                                     | -     
+| C#                    | <a href="https://github.com/LukeHagar/plexcsharp">GitHub</a> | <a href="https://github.com/LukeHagar/plexcsharp/releases">Releases</a>                                     | -<br/>
 </Description>
   </PropertyGroup>
 

LukeHagar/PlexAPI/SDK/Media.cs

@@ -13,14 +13,14 @@ namespace LukeHagar.PlexAPI.SDK
     using LukeHagar.PlexAPI.SDK.Models.Components;
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Models.Requests;
-    using LukeHagar.PlexAPI.SDK.Utils.Retries;
     using LukeHagar.PlexAPI.SDK.Utils;
+    using LukeHagar.PlexAPI.SDK.Utils.Retries;
     using Newtonsoft.Json;
-    using System.Collections.Generic;
-    using System.Net.Http.Headers;
-    using System.Net.Http;
-    using System.Threading.Tasks;
     using System;
+    using System.Collections.Generic;
+    using System.Net.Http;
+    using System.Net.Http.Headers;
+    using System.Threading.Tasks;
 
     /// <summary>
     /// API Calls interacting with Plex Media Server Media<br/>
@@ -39,7 +39,7 @@ namespace LukeHagar.PlexAPI.SDK
         /// This will mark the provided media key as Played.
         /// </remarks>
         /// </summary>
-        Task<MarkPlayedResponse> MarkPlayedAsync(double key, RetryConfig? retryConfig = null);
+        Task<MarkPlayedResponse> MarkPlayedAsync(double key);
 
         /// <summary>
         /// Mark Media Unplayed
@@ -48,7 +48,7 @@ namespace LukeHagar.PlexAPI.SDK
         /// This will mark the provided media key as Unplayed.
         /// </remarks>
         /// </summary>
-        Task<MarkUnplayedResponse> MarkUnplayedAsync(double key, RetryConfig? retryConfig = null);
+        Task<MarkUnplayedResponse> MarkUnplayedAsync(double key);
 
         /// <summary>
         /// Update Media Play Progress
@@ -58,7 +58,7 @@ namespace LukeHagar.PlexAPI.SDK
         /// 
         /// </remarks>
         /// </summary>
-        Task<UpdatePlayProgressResponse> UpdatePlayProgressAsync(string key, double time, string state, RetryConfig? retryConfig = null);
+        Task<UpdatePlayProgressResponse> UpdatePlayProgressAsync(string key, double time, string state);
 
         /// <summary>
         /// Get Banner Image
@@ -67,7 +67,7 @@ namespace LukeHagar.PlexAPI.SDK
         /// Gets the banner image of the media item
         /// </remarks>
         /// </summary>
-        Task<GetBannerImageResponse> GetBannerImageAsync(GetBannerImageRequest request, RetryConfig? retryConfig = null);
+        Task<GetBannerImageResponse> GetBannerImageAsync(GetBannerImageRequest request);
 
         /// <summary>
         /// Get Thumb Image
@@ -76,7 +76,7 @@ namespace LukeHagar.PlexAPI.SDK
         /// Gets the thumbnail image of the media item
         /// </remarks>
         /// </summary>
-        Task<GetThumbImageResponse> GetThumbImageAsync(GetThumbImageRequest request, RetryConfig? retryConfig = null);
+        Task<GetThumbImageResponse> GetThumbImageAsync(GetThumbImageRequest request);
     }
 
     /// <summary>
@@ -90,23 +90,16 @@ namespace LukeHagar.PlexAPI.SDK
     {
         public SDKConfig SDKConfiguration { get; private set; }
         private const string _language = "csharp";
-        private const string _sdkVersion = "0.9.0";
+        private const string _sdkVersion = "0.17.0";
-        private const string _sdkGenVersion = "2.429.0";
+        private const string _sdkGenVersion = "2.698.4";
         private const string _openapiDocVersion = "0.0.3";
-        private const string _userAgent = "speakeasy-sdk/csharp 0.9.0 2.429.0 0.0.3 LukeHagar.PlexAPI.SDK";
-        private string _serverUrl = "";
-        private ISpeakeasyHttpClient _client;
-        private Func<LukeHagar.PlexAPI.SDK.Models.Components.Security>? _securitySource;
 
-        public Media(ISpeakeasyHttpClient client, Func<LukeHagar.PlexAPI.SDK.Models.Components.Security>? securitySource, string serverUrl, SDKConfig config)
+        public Media(SDKConfig config)
         {
-            _client = client;
-            _securitySource = securitySource;
-            _serverUrl = serverUrl;
             SDKConfiguration = config;
         }
 
-        public async Task<MarkPlayedResponse> MarkPlayedAsync(double key, RetryConfig? retryConfig = null)
+        public async Task<MarkPlayedResponse> MarkPlayedAsync(double key)
         {
             var request = new MarkPlayedRequest()
             {
@@ -116,54 +109,21 @@ namespace LukeHagar.PlexAPI.SDK
             var urlString = URLBuilder.Build(baseUrl, "/:/scrobble", request);
 
             var httpRequest = new HttpRequestMessage(HttpMethod.Get, urlString);
-            httpRequest.Headers.Add("user-agent", _userAgent);
+            httpRequest.Headers.Add("user-agent", SDKConfiguration.UserAgent);
 
-            if (_securitySource != null)
+            if (SDKConfiguration.SecuritySource != null)
             {
-                httpRequest = new SecurityMetadata(_securitySource).Apply(httpRequest);
+                httpRequest = new SecurityMetadata(SDKConfiguration.SecuritySource).Apply(httpRequest);
             }
 
-            var hookCtx = new HookContext("markPlayed", null, _securitySource);
+            var hookCtx = new HookContext(SDKConfiguration, baseUrl, "markPlayed", new List<string> {  }, SDKConfiguration.SecuritySource);
 
             httpRequest = await this.SDKConfiguration.Hooks.BeforeRequestAsync(new BeforeRequestContext(hookCtx), httpRequest);
-            if (retryConfig == null)
-            {
-                if (this.SDKConfiguration.RetryConfig != null)
-                {
-                    retryConfig = this.SDKConfiguration.RetryConfig;
-                }
-                else
-                {
-                    var backoff = new BackoffStrategy(
-                        initialIntervalMs: 500L,
-                        maxIntervalMs: 60000L,
-                        maxElapsedTimeMs: 3600000L,
-                        exponent: 1.5
-                    );
-                    retryConfig = new RetryConfig(
-                        strategy: RetryConfig.RetryStrategy.BACKOFF,
-                        backoff: backoff,
-                        retryConnectionErrors: true
-                    );
-                }
-            }
-
-            List<string> statusCodes = new List<string>
-            {
-                "5XX",
-            };
-
-            Func<Task<HttpResponseMessage>> retrySend = async () =>
-            {
-                var _httpRequest = await _client.CloneAsync(httpRequest);
-                return await _client.SendAsync(_httpRequest);
-            };
-            var retries = new LukeHagar.PlexAPI.SDK.Utils.Retries.Retries(retrySend, retryConfig, statusCodes);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await retries.Run();
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -205,33 +165,57 @@ namespace LukeHagar.PlexAPI.SDK
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<MarkPlayedBadRequest>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    MarkPlayedBadRequestPayload payload;
-                    throw obj!;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<MarkPlayedBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into MarkPlayedBadRequestPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new MarkPlayedBadRequest(payload, httpResponse, httpResponseBody);
+                }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
             else if(responseStatusCode == 401)
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<MarkPlayedUnauthorized>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    MarkPlayedUnauthorizedPayload payload;
-                    throw obj!;
+                    try
-                }
-
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
-            }
-            else if(responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
                     {
-                throw new Models.Errors.SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<MarkPlayedUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into MarkPlayedUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-            throw new Models.Errors.SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new MarkPlayedUnauthorized(payload, httpResponse, httpResponseBody);
                 }
 
-        public async Task<MarkUnplayedResponse> MarkUnplayedAsync(double key, RetryConfig? retryConfig = null)
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+
+            throw new Models.Errors.SDKException("Unknown status code received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+        }
+
+        public async Task<MarkUnplayedResponse> MarkUnplayedAsync(double key)
         {
             var request = new MarkUnplayedRequest()
             {
@@ -241,54 +225,21 @@ namespace LukeHagar.PlexAPI.SDK
             var urlString = URLBuilder.Build(baseUrl, "/:/unscrobble", request);
 
             var httpRequest = new HttpRequestMessage(HttpMethod.Get, urlString);
-            httpRequest.Headers.Add("user-agent", _userAgent);
+            httpRequest.Headers.Add("user-agent", SDKConfiguration.UserAgent);
 
-            if (_securitySource != null)
+            if (SDKConfiguration.SecuritySource != null)
             {
-                httpRequest = new SecurityMetadata(_securitySource).Apply(httpRequest);
+                httpRequest = new SecurityMetadata(SDKConfiguration.SecuritySource).Apply(httpRequest);
             }
 
-            var hookCtx = new HookContext("markUnplayed", null, _securitySource);
+            var hookCtx = new HookContext(SDKConfiguration, baseUrl, "markUnplayed", new List<string> {  }, SDKConfiguration.SecuritySource);
 
             httpRequest = await this.SDKConfiguration.Hooks.BeforeRequestAsync(new BeforeRequestContext(hookCtx), httpRequest);
-            if (retryConfig == null)
-            {
-                if (this.SDKConfiguration.RetryConfig != null)
-                {
-                    retryConfig = this.SDKConfiguration.RetryConfig;
-                }
-                else
-                {
-                    var backoff = new BackoffStrategy(
-                        initialIntervalMs: 500L,
-                        maxIntervalMs: 60000L,
-                        maxElapsedTimeMs: 3600000L,
-                        exponent: 1.5
-                    );
-                    retryConfig = new RetryConfig(
-                        strategy: RetryConfig.RetryStrategy.BACKOFF,
-                        backoff: backoff,
-                        retryConnectionErrors: true
-                    );
-                }
-            }
-
-            List<string> statusCodes = new List<string>
-            {
-                "5XX",
-            };
-
-            Func<Task<HttpResponseMessage>> retrySend = async () =>
-            {
-                var _httpRequest = await _client.CloneAsync(httpRequest);
-                return await _client.SendAsync(_httpRequest);
-            };
-            var retries = new LukeHagar.PlexAPI.SDK.Utils.Retries.Retries(retrySend, retryConfig, statusCodes);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await retries.Run();
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -330,33 +281,57 @@ namespace LukeHagar.PlexAPI.SDK
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<MarkUnplayedBadRequest>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    MarkUnplayedBadRequestPayload payload;
-                    throw obj!;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<MarkUnplayedBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into MarkUnplayedBadRequestPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new MarkUnplayedBadRequest(payload, httpResponse, httpResponseBody);
+                }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
             else if(responseStatusCode == 401)
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<MarkUnplayedUnauthorized>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    MarkUnplayedUnauthorizedPayload payload;
-                    throw obj!;
+                    try
-                }
-
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
-            }
-            else if(responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
                     {
-                throw new Models.Errors.SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<MarkUnplayedUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into MarkUnplayedUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-            throw new Models.Errors.SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new MarkUnplayedUnauthorized(payload, httpResponse, httpResponseBody);
                 }
 
-        public async Task<UpdatePlayProgressResponse> UpdatePlayProgressAsync(string key, double time, string state, RetryConfig? retryConfig = null)
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+
+            throw new Models.Errors.SDKException("Unknown status code received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+        }
+
+        public async Task<UpdatePlayProgressResponse> UpdatePlayProgressAsync(string key, double time, string state)
         {
             var request = new UpdatePlayProgressRequest()
             {
@@ -368,54 +343,21 @@ namespace LukeHagar.PlexAPI.SDK
             var urlString = URLBuilder.Build(baseUrl, "/:/progress", request);
 
             var httpRequest = new HttpRequestMessage(HttpMethod.Post, urlString);
-            httpRequest.Headers.Add("user-agent", _userAgent);
+            httpRequest.Headers.Add("user-agent", SDKConfiguration.UserAgent);
 
-            if (_securitySource != null)
+            if (SDKConfiguration.SecuritySource != null)
             {
-                httpRequest = new SecurityMetadata(_securitySource).Apply(httpRequest);
+                httpRequest = new SecurityMetadata(SDKConfiguration.SecuritySource).Apply(httpRequest);
             }
 
-            var hookCtx = new HookContext("updatePlayProgress", null, _securitySource);
+            var hookCtx = new HookContext(SDKConfiguration, baseUrl, "updatePlayProgress", new List<string> {  }, SDKConfiguration.SecuritySource);
 
             httpRequest = await this.SDKConfiguration.Hooks.BeforeRequestAsync(new BeforeRequestContext(hookCtx), httpRequest);
-            if (retryConfig == null)
-            {
-                if (this.SDKConfiguration.RetryConfig != null)
-                {
-                    retryConfig = this.SDKConfiguration.RetryConfig;
-                }
-                else
-                {
-                    var backoff = new BackoffStrategy(
-                        initialIntervalMs: 500L,
-                        maxIntervalMs: 60000L,
-                        maxElapsedTimeMs: 3600000L,
-                        exponent: 1.5
-                    );
-                    retryConfig = new RetryConfig(
-                        strategy: RetryConfig.RetryStrategy.BACKOFF,
-                        backoff: backoff,
-                        retryConnectionErrors: true
-                    );
-                }
-            }
-
-            List<string> statusCodes = new List<string>
-            {
-                "5XX",
-            };
-
-            Func<Task<HttpResponseMessage>> retrySend = async () =>
-            {
-                var _httpRequest = await _client.CloneAsync(httpRequest);
-                return await _client.SendAsync(_httpRequest);
-            };
-            var retries = new LukeHagar.PlexAPI.SDK.Utils.Retries.Retries(retrySend, retryConfig, statusCodes);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await retries.Run();
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -457,87 +399,78 @@ namespace LukeHagar.PlexAPI.SDK
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<UpdatePlayProgressBadRequest>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    UpdatePlayProgressBadRequestPayload payload;
-                    throw obj!;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<UpdatePlayProgressBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into UpdatePlayProgressBadRequestPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new UpdatePlayProgressBadRequest(payload, httpResponse, httpResponseBody);
+                }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
             else if(responseStatusCode == 401)
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<UpdatePlayProgressUnauthorized>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    UpdatePlayProgressUnauthorizedPayload payload;
-                    throw obj!;
+                    try
-                }
-
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
-            }
-            else if(responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
                     {
-                throw new Models.Errors.SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<UpdatePlayProgressUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into UpdatePlayProgressUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-            throw new Models.Errors.SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new UpdatePlayProgressUnauthorized(payload, httpResponse, httpResponseBody);
                 }
 
-        public async Task<GetBannerImageResponse> GetBannerImageAsync(GetBannerImageRequest request, RetryConfig? retryConfig = null)
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+
+            throw new Models.Errors.SDKException("Unknown status code received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+        }
+
+        public async Task<GetBannerImageResponse> GetBannerImageAsync(GetBannerImageRequest request)
         {
             string baseUrl = this.SDKConfiguration.GetTemplatedServerUrl();
             var urlString = URLBuilder.Build(baseUrl, "/library/metadata/{ratingKey}/banner", request);
 
             var httpRequest = new HttpRequestMessage(HttpMethod.Get, urlString);
-            httpRequest.Headers.Add("user-agent", _userAgent);
+            httpRequest.Headers.Add("user-agent", SDKConfiguration.UserAgent);
             HeaderSerializer.PopulateHeaders(ref httpRequest, request);
 
-            if (_securitySource != null)
+            if (SDKConfiguration.SecuritySource != null)
             {
-                httpRequest = new SecurityMetadata(_securitySource).Apply(httpRequest);
+                httpRequest = new SecurityMetadata(SDKConfiguration.SecuritySource).Apply(httpRequest);
             }
 
-            var hookCtx = new HookContext("get-banner-image", null, _securitySource);
+            var hookCtx = new HookContext(SDKConfiguration, baseUrl, "get-banner-image", new List<string> {  }, SDKConfiguration.SecuritySource);
 
             httpRequest = await this.SDKConfiguration.Hooks.BeforeRequestAsync(new BeforeRequestContext(hookCtx), httpRequest);
-            if (retryConfig == null)
-            {
-                if (this.SDKConfiguration.RetryConfig != null)
-                {
-                    retryConfig = this.SDKConfiguration.RetryConfig;
-                }
-                else
-                {
-                    var backoff = new BackoffStrategy(
-                        initialIntervalMs: 500L,
-                        maxIntervalMs: 60000L,
-                        maxElapsedTimeMs: 3600000L,
-                        exponent: 1.5
-                    );
-                    retryConfig = new RetryConfig(
-                        strategy: RetryConfig.RetryStrategy.BACKOFF,
-                        backoff: backoff,
-                        retryConnectionErrors: true
-                    );
-                }
-            }
-
-            List<string> statusCodes = new List<string>
-            {
-                "5XX",
-            };
-
-            Func<Task<HttpResponseMessage>> retrySend = async () =>
-            {
-                var _httpRequest = await _client.CloneAsync(httpRequest);
-                return await _client.SendAsync(_httpRequest);
-            };
-            var retries = new LukeHagar.PlexAPI.SDK.Utils.Retries.Retries(retrySend, retryConfig, statusCodes);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await retries.Run();
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -580,93 +513,84 @@ namespace LukeHagar.PlexAPI.SDK
                     return response;
                 }
 
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
             else if(responseStatusCode == 400)
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<GetBannerImageBadRequest>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    GetBannerImageBadRequestPayload payload;
-                    throw obj!;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetBannerImageBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetBannerImageBadRequestPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new GetBannerImageBadRequest(payload, httpResponse, httpResponseBody);
+                }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
             else if(responseStatusCode == 401)
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<GetBannerImageUnauthorized>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    GetBannerImageUnauthorizedPayload payload;
-                    throw obj!;
+                    try
-                }
-
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
-            }
-            else if(responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
                     {
-                throw new Models.Errors.SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetBannerImageUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetBannerImageUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-            throw new Models.Errors.SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new GetBannerImageUnauthorized(payload, httpResponse, httpResponseBody);
                 }
 
-        public async Task<GetThumbImageResponse> GetThumbImageAsync(GetThumbImageRequest request, RetryConfig? retryConfig = null)
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+
+            throw new Models.Errors.SDKException("Unknown status code received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+        }
+
+        public async Task<GetThumbImageResponse> GetThumbImageAsync(GetThumbImageRequest request)
         {
             string baseUrl = this.SDKConfiguration.GetTemplatedServerUrl();
             var urlString = URLBuilder.Build(baseUrl, "/library/metadata/{ratingKey}/thumb", request);
 
             var httpRequest = new HttpRequestMessage(HttpMethod.Get, urlString);
-            httpRequest.Headers.Add("user-agent", _userAgent);
+            httpRequest.Headers.Add("user-agent", SDKConfiguration.UserAgent);
             HeaderSerializer.PopulateHeaders(ref httpRequest, request);
 
-            if (_securitySource != null)
+            if (SDKConfiguration.SecuritySource != null)
             {
-                httpRequest = new SecurityMetadata(_securitySource).Apply(httpRequest);
+                httpRequest = new SecurityMetadata(SDKConfiguration.SecuritySource).Apply(httpRequest);
             }
 
-            var hookCtx = new HookContext("get-thumb-image", null, _securitySource);
+            var hookCtx = new HookContext(SDKConfiguration, baseUrl, "get-thumb-image", new List<string> {  }, SDKConfiguration.SecuritySource);
 
             httpRequest = await this.SDKConfiguration.Hooks.BeforeRequestAsync(new BeforeRequestContext(hookCtx), httpRequest);
-            if (retryConfig == null)
-            {
-                if (this.SDKConfiguration.RetryConfig != null)
-                {
-                    retryConfig = this.SDKConfiguration.RetryConfig;
-                }
-                else
-                {
-                    var backoff = new BackoffStrategy(
-                        initialIntervalMs: 500L,
-                        maxIntervalMs: 60000L,
-                        maxElapsedTimeMs: 3600000L,
-                        exponent: 1.5
-                    );
-                    retryConfig = new RetryConfig(
-                        strategy: RetryConfig.RetryStrategy.BACKOFF,
-                        backoff: backoff,
-                        retryConnectionErrors: true
-                    );
-                }
-            }
-
-            List<string> statusCodes = new List<string>
-            {
-                "5XX",
-            };
-
-            Func<Task<HttpResponseMessage>> retrySend = async () =>
-            {
-                var _httpRequest = await _client.CloneAsync(httpRequest);
-                return await _client.SendAsync(_httpRequest);
-            };
-            var retries = new LukeHagar.PlexAPI.SDK.Utils.Retries.Retries(retrySend, retryConfig, statusCodes);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await retries.Run();
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -709,36 +633,60 @@ namespace LukeHagar.PlexAPI.SDK
                     return response;
                 }
 
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
             else if(responseStatusCode == 400)
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<GetThumbImageBadRequest>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    GetThumbImageBadRequestPayload payload;
-                    throw obj!;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetThumbImageBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetThumbImageBadRequestPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new GetThumbImageBadRequest(payload, httpResponse, httpResponseBody);
+                }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
             else if(responseStatusCode == 401)
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<GetThumbImageUnauthorized>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
-                    obj!.RawResponse = httpResponse;
+                    GetThumbImageUnauthorizedPayload payload;
-                    throw obj!;
+                    try
-                }
-
-                throw new Models.Errors.SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
-            }
-            else if(responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
                     {
-                throw new Models.Errors.SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetThumbImageUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetThumbImageUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
                     }
 
-            throw new Models.Errors.SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    payload.RawResponse = httpResponse;
+                    throw new GetThumbImageUnauthorized(payload, httpResponse, httpResponseBody);
+                }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
+            {
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
+            }
+
+            throw new Models.Errors.SDKException("Unknown status code received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
         }
     }
 }

LukeHagar/PlexAPI/SDK/Models/Errors/AddPlaylistContentsBadRequest.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class AddPlaylistContentsBadRequestPayload
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class AddPlaylistContentsBadRequest : Exception
     {
-
         [JsonProperty("errors")]
         public List<AddPlaylistContentsErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class AddPlaylistContentsBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public AddPlaylistContentsBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use AddPlaylistContentsBadRequest.Payload.Errors instead.")]
+        public List<AddPlaylistContentsErrors>? Errors { get; set; }
+
+        public AddPlaylistContentsBadRequest(
+            AddPlaylistContentsBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/AddPlaylistContentsUnauthorized.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class AddPlaylistContentsUnauthorizedPayload
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class AddPlaylistContentsUnauthorized : Exception
     {
-
         [JsonProperty("errors")]
         public List<AddPlaylistContentsPlaylistsErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class AddPlaylistContentsUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public AddPlaylistContentsUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use AddPlaylistContentsUnauthorized.Payload.Errors instead.")]
+        public List<AddPlaylistContentsPlaylistsErrors>? Errors { get; set; }
+
+        public AddPlaylistContentsUnauthorized(
+            AddPlaylistContentsUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/ApplyUpdatesBadRequest.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class ApplyUpdatesBadRequestPayload
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class ApplyUpdatesBadRequest : Exception
     {
-
         [JsonProperty("errors")]
         public List<ApplyUpdatesErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class ApplyUpdatesBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public ApplyUpdatesBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use ApplyUpdatesBadRequest.Payload.Errors instead.")]
+        public List<ApplyUpdatesErrors>? Errors { get; set; }
+
+        public ApplyUpdatesBadRequest(
+            ApplyUpdatesBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/ApplyUpdatesUnauthorized.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class ApplyUpdatesUnauthorizedPayload
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class ApplyUpdatesUnauthorized : Exception
     {
-
         [JsonProperty("errors")]
         public List<ApplyUpdatesUpdaterErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class ApplyUpdatesUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public ApplyUpdatesUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use ApplyUpdatesUnauthorized.Payload.Errors instead.")]
+        public List<ApplyUpdatesUpdaterErrors>? Errors { get; set; }
+
+        public ApplyUpdatesUnauthorized(
+            ApplyUpdatesUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/CancelServerActivitiesBadRequest.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class CancelServerActivitiesBadRequestPayload
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class CancelServerActivitiesBadRequest : Exception
     {
-
         [JsonProperty("errors")]
         public List<CancelServerActivitiesErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class CancelServerActivitiesBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public CancelServerActivitiesBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use CancelServerActivitiesBadRequest.Payload.Errors instead.")]
+        public List<CancelServerActivitiesErrors>? Errors { get; set; }
+
+        public CancelServerActivitiesBadRequest(
+            CancelServerActivitiesBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/CancelServerActivitiesUnauthorized.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class CancelServerActivitiesUnauthorizedPayload
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class CancelServerActivitiesUnauthorized : Exception
     {
-
         [JsonProperty("errors")]
         public List<CancelServerActivitiesActivitiesErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class CancelServerActivitiesUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public CancelServerActivitiesUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use CancelServerActivitiesUnauthorized.Payload.Errors instead.")]
+        public List<CancelServerActivitiesActivitiesErrors>? Errors { get; set; }
+
+        public CancelServerActivitiesUnauthorized(
+            CancelServerActivitiesUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/CheckForUpdatesBadRequest.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class CheckForUpdatesBadRequestPayload
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class CheckForUpdatesBadRequest : Exception
     {
-
         [JsonProperty("errors")]
         public List<CheckForUpdatesErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class CheckForUpdatesBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public CheckForUpdatesBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use CheckForUpdatesBadRequest.Payload.Errors instead.")]
+        public List<CheckForUpdatesErrors>? Errors { get; set; }
+
+        public CheckForUpdatesBadRequest(
+            CheckForUpdatesBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/CheckForUpdatesUnauthorized.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class CheckForUpdatesUnauthorizedPayload
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class CheckForUpdatesUnauthorized : Exception
     {
-
         [JsonProperty("errors")]
         public List<CheckForUpdatesUpdaterErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class CheckForUpdatesUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public CheckForUpdatesUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use CheckForUpdatesUnauthorized.Payload.Errors instead.")]
+        public List<CheckForUpdatesUpdaterErrors>? Errors { get; set; }
+
+        public CheckForUpdatesUnauthorized(
+            CheckForUpdatesUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/ClearPlaylistContentsBadRequest.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class ClearPlaylistContentsBadRequestPayload
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class ClearPlaylistContentsBadRequest : Exception
     {
-
         [JsonProperty("errors")]
         public List<ClearPlaylistContentsErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class ClearPlaylistContentsBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public ClearPlaylistContentsBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use ClearPlaylistContentsBadRequest.Payload.Errors instead.")]
+        public List<ClearPlaylistContentsErrors>? Errors { get; set; }
+
+        public ClearPlaylistContentsBadRequest(
+            ClearPlaylistContentsBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/ClearPlaylistContentsUnauthorized.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class ClearPlaylistContentsUnauthorizedPayload
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class ClearPlaylistContentsUnauthorized : Exception
     {
-
         [JsonProperty("errors")]
         public List<ClearPlaylistContentsPlaylistsErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class ClearPlaylistContentsUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public ClearPlaylistContentsUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use ClearPlaylistContentsUnauthorized.Payload.Errors instead.")]
+        public List<ClearPlaylistContentsPlaylistsErrors>? Errors { get; set; }
+
+        public ClearPlaylistContentsUnauthorized(
+            ClearPlaylistContentsUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/CreatePlaylistBadRequest.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class CreatePlaylistBadRequestPayload
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class CreatePlaylistBadRequest : Exception
     {
-
         [JsonProperty("errors")]
         public List<CreatePlaylistErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class CreatePlaylistBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public CreatePlaylistBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use CreatePlaylistBadRequest.Payload.Errors instead.")]
+        public List<CreatePlaylistErrors>? Errors { get; set; }
+
+        public CreatePlaylistBadRequest(
+            CreatePlaylistBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/CreatePlaylistUnauthorized.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class CreatePlaylistUnauthorizedPayload
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class CreatePlaylistUnauthorized : Exception
     {
-
         [JsonProperty("errors")]
         public List<CreatePlaylistPlaylistsErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class CreatePlaylistUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public CreatePlaylistUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use CreatePlaylistUnauthorized.Payload.Errors instead.")]
+        public List<CreatePlaylistPlaylistsErrors>? Errors { get; set; }
+
+        public CreatePlaylistUnauthorized(
+            CreatePlaylistUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/DeleteLibraryBadRequest.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class DeleteLibraryBadRequestPayload
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class DeleteLibraryBadRequest : Exception
     {
-
         [JsonProperty("errors")]
         public List<DeleteLibraryErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class DeleteLibraryBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public DeleteLibraryBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use DeleteLibraryBadRequest.Payload.Errors instead.")]
+        public List<DeleteLibraryErrors>? Errors { get; set; }
+
+        public DeleteLibraryBadRequest(
+            DeleteLibraryBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/DeleteLibraryUnauthorized.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class DeleteLibraryUnauthorizedPayload
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class DeleteLibraryUnauthorized : Exception
     {
-
         [JsonProperty("errors")]
         public List<DeleteLibraryLibraryErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class DeleteLibraryUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public DeleteLibraryUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use DeleteLibraryUnauthorized.Payload.Errors instead.")]
+        public List<DeleteLibraryLibraryErrors>? Errors { get; set; }
+
+        public DeleteLibraryUnauthorized(
+            DeleteLibraryUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/DeletePlaylistBadRequest.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class DeletePlaylistBadRequestPayload
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class DeletePlaylistBadRequest : Exception
     {
-
         [JsonProperty("errors")]
         public List<DeletePlaylistErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class DeletePlaylistBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public DeletePlaylistBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use DeletePlaylistBadRequest.Payload.Errors instead.")]
+        public List<DeletePlaylistErrors>? Errors { get; set; }
+
+        public DeletePlaylistBadRequest(
+            DeletePlaylistBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/DeletePlaylistUnauthorized.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class DeletePlaylistUnauthorizedPayload
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class DeletePlaylistUnauthorized : Exception
     {
-
         [JsonProperty("errors")]
         public List<DeletePlaylistPlaylistsErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class DeletePlaylistUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public DeletePlaylistUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use DeletePlaylistUnauthorized.Payload.Errors instead.")]
+        public List<DeletePlaylistPlaylistsErrors>? Errors { get; set; }
+
+        public DeletePlaylistUnauthorized(
+            DeletePlaylistUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/EnablePaperTrailBadRequest.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class EnablePaperTrailBadRequestPayload
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class EnablePaperTrailBadRequest : Exception
     {
-
         [JsonProperty("errors")]
         public List<EnablePaperTrailErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class EnablePaperTrailBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public EnablePaperTrailBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use EnablePaperTrailBadRequest.Payload.Errors instead.")]
+        public List<EnablePaperTrailErrors>? Errors { get; set; }
+
+        public EnablePaperTrailBadRequest(
+            EnablePaperTrailBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/EnablePaperTrailUnauthorized.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class EnablePaperTrailUnauthorizedPayload
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class EnablePaperTrailUnauthorized : Exception
     {
-
         [JsonProperty("errors")]
         public List<EnablePaperTrailLogErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class EnablePaperTrailUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public EnablePaperTrailUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use EnablePaperTrailUnauthorized.Payload.Errors instead.")]
+        public List<EnablePaperTrailLogErrors>? Errors { get; set; }
+
+        public EnablePaperTrailUnauthorized(
+            EnablePaperTrailUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetActorsLibraryBadRequest.cs

@@ -12,18 +12,14 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetActorsLibraryBadRequestPayload
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class GetOnDeckBadRequest : Exception
     {
-
         [JsonProperty("errors")]
-        public List<GetOnDeckErrors>? Errors { get; set; }
+        public List<GetActorsLibraryErrors>? Errors { get; set; }
 
         /// <summary>
         /// Raw HTTP response; suitable for custom response parsing
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class GetActorsLibraryBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetActorsLibraryBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetActorsLibraryBadRequest.Payload.Errors instead.")]
+        public List<GetActorsLibraryErrors>? Errors { get; set; }
+
+        public GetActorsLibraryBadRequest(
+            GetActorsLibraryBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetActorsLibraryErrors.cs

@@ -12,7 +12,7 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
     
-    public class GetOnDeckLibraryErrors
+    public class GetActorsLibraryErrors
     {
 
         [JsonProperty("code")]

LukeHagar/PlexAPI/SDK/Models/Errors/GetActorsLibraryLibraryErrors.cs

@@ -12,7 +12,7 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
     
-    public class GetMetaDataByRatingKeyLibraryErrors
+    public class GetActorsLibraryLibraryErrors
     {
 
         [JsonProperty("code")]

LukeHagar/PlexAPI/SDK/Models/Errors/GetActorsLibraryUnauthorized.cs

@@ -0,0 +1,58 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+//
+// Changes to this file may cause incorrect behavior and will be lost when
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+namespace LukeHagar.PlexAPI.SDK.Models.Errors
+{
+    using LukeHagar.PlexAPI.SDK.Models.Errors;
+    using LukeHagar.PlexAPI.SDK.Utils;
+    using Newtonsoft.Json;
+    using System;
+    using System.Collections.Generic;
+    using System.Net.Http;
+
+    public class GetActorsLibraryUnauthorizedPayload
+    {
+        [JsonProperty("errors")]
+        public List<GetActorsLibraryLibraryErrors>? Errors { get; set; }
+
+        /// <summary>
+        /// Raw HTTP response; suitable for custom response parsing
+        /// </summary>
+        [JsonProperty("-")]
+        public HttpResponseMessage? RawResponse { get; set; }
+    }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class GetActorsLibraryUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetActorsLibraryUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetActorsLibraryUnauthorized.Payload.Errors instead.")]
+        public List<GetActorsLibraryLibraryErrors>? Errors { get; set; }
+
+        public GetActorsLibraryUnauthorized(
+            GetActorsLibraryUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
+}

LukeHagar/PlexAPI/SDK/Models/Errors/GetAllLibrariesBadRequest.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetAllLibrariesBadRequestPayload
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class GetAllLibrariesBadRequest : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetAllLibrariesErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class GetAllLibrariesBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetAllLibrariesBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetAllLibrariesBadRequest.Payload.Errors instead.")]
+        public List<GetAllLibrariesErrors>? Errors { get; set; }
+
+        public GetAllLibrariesBadRequest(
+            GetAllLibrariesBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetAllLibrariesUnauthorized.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetAllLibrariesUnauthorizedPayload
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class GetAllLibrariesUnauthorized : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetAllLibrariesLibraryErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class GetAllLibrariesUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetAllLibrariesUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetAllLibrariesUnauthorized.Payload.Errors instead.")]
+        public List<GetAllLibrariesLibraryErrors>? Errors { get; set; }
+
+        public GetAllLibrariesUnauthorized(
+            GetAllLibrariesUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetAvailableClientsBadRequest.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetAvailableClientsBadRequestPayload
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class GetAvailableClientsBadRequest : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetAvailableClientsErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class GetAvailableClientsBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetAvailableClientsBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetAvailableClientsBadRequest.Payload.Errors instead.")]
+        public List<GetAvailableClientsErrors>? Errors { get; set; }
+
+        public GetAvailableClientsBadRequest(
+            GetAvailableClientsBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetAvailableClientsUnauthorized.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetAvailableClientsUnauthorizedPayload
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class GetAvailableClientsUnauthorized : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetAvailableClientsServerErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class GetAvailableClientsUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetAvailableClientsUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetAvailableClientsUnauthorized.Payload.Errors instead.")]
+        public List<GetAvailableClientsServerErrors>? Errors { get; set; }
+
+        public GetAvailableClientsUnauthorized(
+            GetAvailableClientsUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetBandwidthStatisticsBadRequest.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetBandwidthStatisticsBadRequestPayload
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class GetBandwidthStatisticsBadRequest : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetBandwidthStatisticsErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class GetBandwidthStatisticsBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetBandwidthStatisticsBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetBandwidthStatisticsBadRequest.Payload.Errors instead.")]
+        public List<GetBandwidthStatisticsErrors>? Errors { get; set; }
+
+        public GetBandwidthStatisticsBadRequest(
+            GetBandwidthStatisticsBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetBandwidthStatisticsUnauthorized.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetBandwidthStatisticsUnauthorizedPayload
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class GetBandwidthStatisticsUnauthorized : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetBandwidthStatisticsStatisticsErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class GetBandwidthStatisticsUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetBandwidthStatisticsUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetBandwidthStatisticsUnauthorized.Payload.Errors instead.")]
+        public List<GetBandwidthStatisticsStatisticsErrors>? Errors { get; set; }
+
+        public GetBandwidthStatisticsUnauthorized(
+            GetBandwidthStatisticsUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetBannerImageBadRequest.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetBannerImageBadRequestPayload
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class GetBannerImageBadRequest : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetBannerImageErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class GetBannerImageBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetBannerImageBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetBannerImageBadRequest.Payload.Errors instead.")]
+        public List<GetBannerImageErrors>? Errors { get; set; }
+
+        public GetBannerImageBadRequest(
+            GetBannerImageBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetBannerImageUnauthorized.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetBannerImageUnauthorizedPayload
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class GetBannerImageUnauthorized : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetBannerImageMediaErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class GetBannerImageUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetBannerImageUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetBannerImageUnauthorized.Payload.Errors instead.")]
+        public List<GetBannerImageMediaErrors>? Errors { get; set; }
+
+        public GetBannerImageUnauthorized(
+            GetBannerImageUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetButlerTasksBadRequest.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetButlerTasksBadRequestPayload
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class GetButlerTasksBadRequest : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetButlerTasksErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class GetButlerTasksBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetButlerTasksBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetButlerTasksBadRequest.Payload.Errors instead.")]
+        public List<GetButlerTasksErrors>? Errors { get; set; }
+
+        public GetButlerTasksBadRequest(
+            GetButlerTasksBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetButlerTasksUnauthorized.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetButlerTasksUnauthorizedPayload
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class GetButlerTasksUnauthorized : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetButlerTasksButlerErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class GetButlerTasksUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetButlerTasksUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetButlerTasksUnauthorized.Payload.Errors instead.")]
+        public List<GetButlerTasksButlerErrors>? Errors { get; set; }
+
+        public GetButlerTasksUnauthorized(
+            GetButlerTasksUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetCompanionsDataBadRequest.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetCompanionsDataBadRequestPayload
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class GetCompanionsDataBadRequest : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetCompanionsDataErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class GetCompanionsDataBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetCompanionsDataBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetCompanionsDataBadRequest.Payload.Errors instead.")]
+        public List<GetCompanionsDataErrors>? Errors { get; set; }
+
+        public GetCompanionsDataBadRequest(
+            GetCompanionsDataBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetCompanionsDataUnauthorized.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetCompanionsDataUnauthorizedPayload
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class GetCompanionsDataUnauthorized : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetCompanionsDataPlexErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class GetCompanionsDataUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetCompanionsDataUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetCompanionsDataUnauthorized.Payload.Errors instead.")]
+        public List<GetCompanionsDataPlexErrors>? Errors { get; set; }
+
+        public GetCompanionsDataUnauthorized(
+            GetCompanionsDataUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetCountriesLibraryBadRequest.cs

@@ -0,0 +1,58 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+//
+// Changes to this file may cause incorrect behavior and will be lost when
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+namespace LukeHagar.PlexAPI.SDK.Models.Errors
+{
+    using LukeHagar.PlexAPI.SDK.Models.Errors;
+    using LukeHagar.PlexAPI.SDK.Utils;
+    using Newtonsoft.Json;
+    using System;
+    using System.Collections.Generic;
+    using System.Net.Http;
+
+    public class GetCountriesLibraryBadRequestPayload
+    {
+        [JsonProperty("errors")]
+        public List<GetCountriesLibraryErrors>? Errors { get; set; }
+
+        /// <summary>
+        /// Raw HTTP response; suitable for custom response parsing
+        /// </summary>
+        [JsonProperty("-")]
+        public HttpResponseMessage? RawResponse { get; set; }
+    }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class GetCountriesLibraryBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetCountriesLibraryBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetCountriesLibraryBadRequest.Payload.Errors instead.")]
+        public List<GetCountriesLibraryErrors>? Errors { get; set; }
+
+        public GetCountriesLibraryBadRequest(
+            GetCountriesLibraryBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
+}

LukeHagar/PlexAPI/SDK/Models/Errors/GetCountriesLibraryErrors.cs

@@ -12,7 +12,7 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
     
-    public class GetMetaDataByRatingKeyErrors
+    public class GetCountriesLibraryErrors
     {
 
         [JsonProperty("code")]

LukeHagar/PlexAPI/SDK/Models/Errors/GetCountriesLibraryLibraryErrors.cs

@@ -0,0 +1,27 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+//
+// Changes to this file may cause incorrect behavior and will be lost when
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+namespace LukeHagar.PlexAPI.SDK.Models.Errors
+{
+    using LukeHagar.PlexAPI.SDK.Utils;
+    using Newtonsoft.Json;
+    
+    public class GetCountriesLibraryLibraryErrors
+    {
+
+        [JsonProperty("code")]
+        public int? Code { get; set; }
+
+        [JsonProperty("message")]
+        public string? Message { get; set; }
+
+        [JsonProperty("status")]
+        public int? Status { get; set; }
+    }
+}

LukeHagar/PlexAPI/SDK/Models/Errors/GetCountriesLibraryUnauthorized.cs

@@ -0,0 +1,58 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+//
+// Changes to this file may cause incorrect behavior and will be lost when
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+namespace LukeHagar.PlexAPI.SDK.Models.Errors
+{
+    using LukeHagar.PlexAPI.SDK.Models.Errors;
+    using LukeHagar.PlexAPI.SDK.Utils;
+    using Newtonsoft.Json;
+    using System;
+    using System.Collections.Generic;
+    using System.Net.Http;
+
+    public class GetCountriesLibraryUnauthorizedPayload
+    {
+        [JsonProperty("errors")]
+        public List<GetCountriesLibraryLibraryErrors>? Errors { get; set; }
+
+        /// <summary>
+        /// Raw HTTP response; suitable for custom response parsing
+        /// </summary>
+        [JsonProperty("-")]
+        public HttpResponseMessage? RawResponse { get; set; }
+    }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class GetCountriesLibraryUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetCountriesLibraryUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetCountriesLibraryUnauthorized.Payload.Errors instead.")]
+        public List<GetCountriesLibraryLibraryErrors>? Errors { get; set; }
+
+        public GetCountriesLibraryUnauthorized(
+            GetCountriesLibraryUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
+}

LukeHagar/PlexAPI/SDK/Models/Errors/GetDevicesBadRequest.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetDevicesBadRequestPayload
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class GetDevicesBadRequest : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetDevicesErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class GetDevicesBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetDevicesBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetDevicesBadRequest.Payload.Errors instead.")]
+        public List<GetDevicesErrors>? Errors { get; set; }
+
+        public GetDevicesBadRequest(
+            GetDevicesBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetDevicesUnauthorized.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetDevicesUnauthorizedPayload
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class GetDevicesUnauthorized : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetDevicesServerErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class GetDevicesUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetDevicesUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetDevicesUnauthorized.Payload.Errors instead.")]
+        public List<GetDevicesServerErrors>? Errors { get; set; }
+
+        public GetDevicesUnauthorized(
+            GetDevicesUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetFileHashBadRequest.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetFileHashBadRequestPayload
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class GetFileHashBadRequest : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetFileHashErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class GetFileHashBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetFileHashBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetFileHashBadRequest.Payload.Errors instead.")]
+        public List<GetFileHashErrors>? Errors { get; set; }
+
+        public GetFileHashBadRequest(
+            GetFileHashBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetFileHashUnauthorized.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetFileHashUnauthorizedPayload
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class GetFileHashUnauthorized : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetFileHashLibraryErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class GetFileHashUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetFileHashUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetFileHashUnauthorized.Payload.Errors instead.")]
+        public List<GetFileHashLibraryErrors>? Errors { get; set; }
+
+        public GetFileHashUnauthorized(
+            GetFileHashUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetGenresLibraryBadRequest.cs

@@ -0,0 +1,58 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+//
+// Changes to this file may cause incorrect behavior and will be lost when
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+namespace LukeHagar.PlexAPI.SDK.Models.Errors
+{
+    using LukeHagar.PlexAPI.SDK.Models.Errors;
+    using LukeHagar.PlexAPI.SDK.Utils;
+    using Newtonsoft.Json;
+    using System;
+    using System.Collections.Generic;
+    using System.Net.Http;
+
+    public class GetGenresLibraryBadRequestPayload
+    {
+        [JsonProperty("errors")]
+        public List<GetGenresLibraryErrors>? Errors { get; set; }
+
+        /// <summary>
+        /// Raw HTTP response; suitable for custom response parsing
+        /// </summary>
+        [JsonProperty("-")]
+        public HttpResponseMessage? RawResponse { get; set; }
+    }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class GetGenresLibraryBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetGenresLibraryBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetGenresLibraryBadRequest.Payload.Errors instead.")]
+        public List<GetGenresLibraryErrors>? Errors { get; set; }
+
+        public GetGenresLibraryBadRequest(
+            GetGenresLibraryBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
+}

LukeHagar/PlexAPI/SDK/Models/Errors/GetGenresLibraryErrors.cs

@@ -0,0 +1,27 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+//
+// Changes to this file may cause incorrect behavior and will be lost when
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+namespace LukeHagar.PlexAPI.SDK.Models.Errors
+{
+    using LukeHagar.PlexAPI.SDK.Utils;
+    using Newtonsoft.Json;
+    
+    public class GetGenresLibraryErrors
+    {
+
+        [JsonProperty("code")]
+        public int? Code { get; set; }
+
+        [JsonProperty("message")]
+        public string? Message { get; set; }
+
+        [JsonProperty("status")]
+        public int? Status { get; set; }
+    }
+}

LukeHagar/PlexAPI/SDK/Models/Errors/GetGenresLibraryLibraryErrors.cs

@@ -0,0 +1,27 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+//
+// Changes to this file may cause incorrect behavior and will be lost when
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+namespace LukeHagar.PlexAPI.SDK.Models.Errors
+{
+    using LukeHagar.PlexAPI.SDK.Utils;
+    using Newtonsoft.Json;
+    
+    public class GetGenresLibraryLibraryErrors
+    {
+
+        [JsonProperty("code")]
+        public int? Code { get; set; }
+
+        [JsonProperty("message")]
+        public string? Message { get; set; }
+
+        [JsonProperty("status")]
+        public int? Status { get; set; }
+    }
+}

LukeHagar/PlexAPI/SDK/Models/Errors/GetGenresLibraryUnauthorized.cs

@@ -0,0 +1,58 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+//
+// Changes to this file may cause incorrect behavior and will be lost when
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+namespace LukeHagar.PlexAPI.SDK.Models.Errors
+{
+    using LukeHagar.PlexAPI.SDK.Models.Errors;
+    using LukeHagar.PlexAPI.SDK.Utils;
+    using Newtonsoft.Json;
+    using System;
+    using System.Collections.Generic;
+    using System.Net.Http;
+
+    public class GetGenresLibraryUnauthorizedPayload
+    {
+        [JsonProperty("errors")]
+        public List<GetGenresLibraryLibraryErrors>? Errors { get; set; }
+
+        /// <summary>
+        /// Raw HTTP response; suitable for custom response parsing
+        /// </summary>
+        [JsonProperty("-")]
+        public HttpResponseMessage? RawResponse { get; set; }
+    }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class GetGenresLibraryUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetGenresLibraryUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetGenresLibraryUnauthorized.Payload.Errors instead.")]
+        public List<GetGenresLibraryLibraryErrors>? Errors { get; set; }
+
+        public GetGenresLibraryUnauthorized(
+            GetGenresLibraryUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
+}

LukeHagar/PlexAPI/SDK/Models/Errors/GetGeoDataBadRequest.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetGeoDataBadRequestPayload
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class GetGeoDataBadRequest : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetGeoDataErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class GetGeoDataBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetGeoDataBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetGeoDataBadRequest.Payload.Errors instead.")]
+        public List<GetGeoDataErrors>? Errors { get; set; }
+
+        public GetGeoDataBadRequest(
+            GetGeoDataBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetGeoDataUnauthorized.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetGeoDataUnauthorizedPayload
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class GetGeoDataUnauthorized : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetGeoDataPlexErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class GetGeoDataUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetGeoDataUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetGeoDataUnauthorized.Payload.Errors instead.")]
+        public List<GetGeoDataPlexErrors>? Errors { get; set; }
+
+        public GetGeoDataUnauthorized(
+            GetGeoDataUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetGlobalHubsBadRequest.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetGlobalHubsBadRequestPayload
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class GetGlobalHubsBadRequest : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetGlobalHubsErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class GetGlobalHubsBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetGlobalHubsBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetGlobalHubsBadRequest.Payload.Errors instead.")]
+        public List<GetGlobalHubsErrors>? Errors { get; set; }
+
+        public GetGlobalHubsBadRequest(
+            GetGlobalHubsBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetGlobalHubsUnauthorized.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetGlobalHubsUnauthorizedPayload
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class GetGlobalHubsUnauthorized : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetGlobalHubsHubsErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class GetGlobalHubsUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetGlobalHubsUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetGlobalHubsUnauthorized.Payload.Errors instead.")]
+        public List<GetGlobalHubsHubsErrors>? Errors { get; set; }
+
+        public GetGlobalHubsUnauthorized(
+            GetGlobalHubsUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetHomeDataBadRequest.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetHomeDataBadRequestPayload
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class GetHomeDataBadRequest : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetHomeDataErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class GetHomeDataBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetHomeDataBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetHomeDataBadRequest.Payload.Errors instead.")]
+        public List<GetHomeDataErrors>? Errors { get; set; }
+
+        public GetHomeDataBadRequest(
+            GetHomeDataBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetHomeDataUnauthorized.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetHomeDataUnauthorizedPayload
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class GetHomeDataUnauthorized : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetHomeDataPlexErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class GetHomeDataUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetHomeDataUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetHomeDataUnauthorized.Payload.Errors instead.")]
+        public List<GetHomeDataPlexErrors>? Errors { get; set; }
+
+        public GetHomeDataUnauthorized(
+            GetHomeDataUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetLibraryDetailsBadRequest.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetLibraryDetailsBadRequestPayload
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class GetLibraryDetailsBadRequest : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetLibraryDetailsErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class GetLibraryDetailsBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetLibraryDetailsBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetLibraryDetailsBadRequest.Payload.Errors instead.")]
+        public List<GetLibraryDetailsErrors>? Errors { get; set; }
+
+        public GetLibraryDetailsBadRequest(
+            GetLibraryDetailsBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetLibraryDetailsUnauthorized.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetLibraryDetailsUnauthorizedPayload
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class GetLibraryDetailsUnauthorized : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetLibraryDetailsLibraryErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class GetLibraryDetailsUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetLibraryDetailsUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetLibraryDetailsUnauthorized.Payload.Errors instead.")]
+        public List<GetLibraryDetailsLibraryErrors>? Errors { get; set; }
+
+        public GetLibraryDetailsUnauthorized(
+            GetLibraryDetailsUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetLibraryHubsBadRequest.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetLibraryHubsBadRequestPayload
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class GetLibraryHubsBadRequest : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetLibraryHubsErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class GetLibraryHubsBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetLibraryHubsBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetLibraryHubsBadRequest.Payload.Errors instead.")]
+        public List<GetLibraryHubsErrors>? Errors { get; set; }
+
+        public GetLibraryHubsBadRequest(
+            GetLibraryHubsBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetLibraryHubsUnauthorized.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetLibraryHubsUnauthorizedPayload
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class GetLibraryHubsUnauthorized : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetLibraryHubsHubsErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class GetLibraryHubsUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetLibraryHubsUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetLibraryHubsUnauthorized.Payload.Errors instead.")]
+        public List<GetLibraryHubsHubsErrors>? Errors { get; set; }
+
+        public GetLibraryHubsUnauthorized(
+            GetLibraryHubsUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetLibraryItemsBadRequest.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetLibraryItemsBadRequestPayload
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class GetLibraryItemsBadRequest : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetLibraryItemsErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class GetLibraryItemsBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetLibraryItemsBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetLibraryItemsBadRequest.Payload.Errors instead.")]
+        public List<GetLibraryItemsErrors>? Errors { get; set; }
+
+        public GetLibraryItemsBadRequest(
+            GetLibraryItemsBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetLibraryItemsUnauthorized.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetLibraryItemsUnauthorizedPayload
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class GetLibraryItemsUnauthorized : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetLibraryItemsLibraryErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class GetLibraryItemsUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetLibraryItemsUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetLibraryItemsUnauthorized.Payload.Errors instead.")]
+        public List<GetLibraryItemsLibraryErrors>? Errors { get; set; }
+
+        public GetLibraryItemsUnauthorized(
+            GetLibraryItemsUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetLibrarySectionsAllBadRequest.cs

@@ -0,0 +1,58 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+//
+// Changes to this file may cause incorrect behavior and will be lost when
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+namespace LukeHagar.PlexAPI.SDK.Models.Errors
+{
+    using LukeHagar.PlexAPI.SDK.Models.Errors;
+    using LukeHagar.PlexAPI.SDK.Utils;
+    using Newtonsoft.Json;
+    using System;
+    using System.Collections.Generic;
+    using System.Net.Http;
+
+    public class GetLibrarySectionsAllBadRequestPayload
+    {
+        [JsonProperty("errors")]
+        public List<GetLibrarySectionsAllErrors>? Errors { get; set; }
+
+        /// <summary>
+        /// Raw HTTP response; suitable for custom response parsing
+        /// </summary>
+        [JsonProperty("-")]
+        public HttpResponseMessage? RawResponse { get; set; }
+    }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class GetLibrarySectionsAllBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetLibrarySectionsAllBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetLibrarySectionsAllBadRequest.Payload.Errors instead.")]
+        public List<GetLibrarySectionsAllErrors>? Errors { get; set; }
+
+        public GetLibrarySectionsAllBadRequest(
+            GetLibrarySectionsAllBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
+}

LukeHagar/PlexAPI/SDK/Models/Errors/GetLibrarySectionsAllErrors.cs

@@ -0,0 +1,27 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+//
+// Changes to this file may cause incorrect behavior and will be lost when
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+namespace LukeHagar.PlexAPI.SDK.Models.Errors
+{
+    using LukeHagar.PlexAPI.SDK.Utils;
+    using Newtonsoft.Json;
+    
+    public class GetLibrarySectionsAllErrors
+    {
+
+        [JsonProperty("code")]
+        public int? Code { get; set; }
+
+        [JsonProperty("message")]
+        public string? Message { get; set; }
+
+        [JsonProperty("status")]
+        public int? Status { get; set; }
+    }
+}

LukeHagar/PlexAPI/SDK/Models/Errors/GetLibrarySectionsAllLibraryErrors.cs

@@ -0,0 +1,27 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+//
+// Changes to this file may cause incorrect behavior and will be lost when
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+namespace LukeHagar.PlexAPI.SDK.Models.Errors
+{
+    using LukeHagar.PlexAPI.SDK.Utils;
+    using Newtonsoft.Json;
+    
+    public class GetLibrarySectionsAllLibraryErrors
+    {
+
+        [JsonProperty("code")]
+        public int? Code { get; set; }
+
+        [JsonProperty("message")]
+        public string? Message { get; set; }
+
+        [JsonProperty("status")]
+        public int? Status { get; set; }
+    }
+}

LukeHagar/PlexAPI/SDK/Models/Errors/GetLibrarySectionsAllUnauthorized.cs

@@ -0,0 +1,58 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+//
+// Changes to this file may cause incorrect behavior and will be lost when
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+namespace LukeHagar.PlexAPI.SDK.Models.Errors
+{
+    using LukeHagar.PlexAPI.SDK.Models.Errors;
+    using LukeHagar.PlexAPI.SDK.Utils;
+    using Newtonsoft.Json;
+    using System;
+    using System.Collections.Generic;
+    using System.Net.Http;
+
+    public class GetLibrarySectionsAllUnauthorizedPayload
+    {
+        [JsonProperty("errors")]
+        public List<GetLibrarySectionsAllLibraryErrors>? Errors { get; set; }
+
+        /// <summary>
+        /// Raw HTTP response; suitable for custom response parsing
+        /// </summary>
+        [JsonProperty("-")]
+        public HttpResponseMessage? RawResponse { get; set; }
+    }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class GetLibrarySectionsAllUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetLibrarySectionsAllUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetLibrarySectionsAllUnauthorized.Payload.Errors instead.")]
+        public List<GetLibrarySectionsAllLibraryErrors>? Errors { get; set; }
+
+        public GetLibrarySectionsAllUnauthorized(
+            GetLibrarySectionsAllUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
+}

LukeHagar/PlexAPI/SDK/Models/Errors/GetMediaMetaDataBadRequest.cs

@@ -0,0 +1,58 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+//
+// Changes to this file may cause incorrect behavior and will be lost when
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+namespace LukeHagar.PlexAPI.SDK.Models.Errors
+{
+    using LukeHagar.PlexAPI.SDK.Models.Errors;
+    using LukeHagar.PlexAPI.SDK.Utils;
+    using Newtonsoft.Json;
+    using System;
+    using System.Collections.Generic;
+    using System.Net.Http;
+
+    public class GetMediaMetaDataBadRequestPayload
+    {
+        [JsonProperty("errors")]
+        public List<GetMediaMetaDataErrors>? Errors { get; set; }
+
+        /// <summary>
+        /// Raw HTTP response; suitable for custom response parsing
+        /// </summary>
+        [JsonProperty("-")]
+        public HttpResponseMessage? RawResponse { get; set; }
+    }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class GetMediaMetaDataBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetMediaMetaDataBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetMediaMetaDataBadRequest.Payload.Errors instead.")]
+        public List<GetMediaMetaDataErrors>? Errors { get; set; }
+
+        public GetMediaMetaDataBadRequest(
+            GetMediaMetaDataBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
+}

LukeHagar/PlexAPI/SDK/Models/Errors/GetMediaMetaDataErrors.cs

@@ -0,0 +1,27 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+//
+// Changes to this file may cause incorrect behavior and will be lost when
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+namespace LukeHagar.PlexAPI.SDK.Models.Errors
+{
+    using LukeHagar.PlexAPI.SDK.Utils;
+    using Newtonsoft.Json;
+    
+    public class GetMediaMetaDataErrors
+    {
+
+        [JsonProperty("code")]
+        public int? Code { get; set; }
+
+        [JsonProperty("message")]
+        public string? Message { get; set; }
+
+        [JsonProperty("status")]
+        public int? Status { get; set; }
+    }
+}

LukeHagar/PlexAPI/SDK/Models/Errors/GetMediaMetaDataLibraryErrors.cs

@@ -0,0 +1,27 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+//
+// Changes to this file may cause incorrect behavior and will be lost when
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+namespace LukeHagar.PlexAPI.SDK.Models.Errors
+{
+    using LukeHagar.PlexAPI.SDK.Utils;
+    using Newtonsoft.Json;
+    
+    public class GetMediaMetaDataLibraryErrors
+    {
+
+        [JsonProperty("code")]
+        public int? Code { get; set; }
+
+        [JsonProperty("message")]
+        public string? Message { get; set; }
+
+        [JsonProperty("status")]
+        public int? Status { get; set; }
+    }
+}

LukeHagar/PlexAPI/SDK/Models/Errors/GetMediaMetaDataUnauthorized.cs

@@ -0,0 +1,58 @@
+//------------------------------------------------------------------------------
+// <auto-generated>
+// This code was generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
+//
+// Changes to this file may cause incorrect behavior and will be lost when
+// the code is regenerated.
+// </auto-generated>
+//------------------------------------------------------------------------------
+#nullable enable
+namespace LukeHagar.PlexAPI.SDK.Models.Errors
+{
+    using LukeHagar.PlexAPI.SDK.Models.Errors;
+    using LukeHagar.PlexAPI.SDK.Utils;
+    using Newtonsoft.Json;
+    using System;
+    using System.Collections.Generic;
+    using System.Net.Http;
+
+    public class GetMediaMetaDataUnauthorizedPayload
+    {
+        [JsonProperty("errors")]
+        public List<GetMediaMetaDataLibraryErrors>? Errors { get; set; }
+
+        /// <summary>
+        /// Raw HTTP response; suitable for custom response parsing
+        /// </summary>
+        [JsonProperty("-")]
+        public HttpResponseMessage? RawResponse { get; set; }
+    }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class GetMediaMetaDataUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetMediaMetaDataUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetMediaMetaDataUnauthorized.Payload.Errors instead.")]
+        public List<GetMediaMetaDataLibraryErrors>? Errors { get; set; }
+
+        public GetMediaMetaDataUnauthorized(
+            GetMediaMetaDataUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
+}

LukeHagar/PlexAPI/SDK/Models/Errors/GetMediaProvidersBadRequest.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetMediaProvidersBadRequestPayload
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class GetMediaProvidersBadRequest : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetMediaProvidersErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class GetMediaProvidersBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetMediaProvidersBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetMediaProvidersBadRequest.Payload.Errors instead.")]
+        public List<GetMediaProvidersErrors>? Errors { get; set; }
+
+        public GetMediaProvidersBadRequest(
+            GetMediaProvidersBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetMediaProvidersUnauthorized.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetMediaProvidersUnauthorizedPayload
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class GetMediaProvidersUnauthorized : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetMediaProvidersServerErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class GetMediaProvidersUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetMediaProvidersUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetMediaProvidersUnauthorized.Payload.Errors instead.")]
+        public List<GetMediaProvidersServerErrors>? Errors { get; set; }
+
+        public GetMediaProvidersUnauthorized(
+            GetMediaProvidersUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetMetaDataByRatingKeyUnauthorized.cs

@@ -1,34 +0,0 @@
-//------------------------------------------------------------------------------
-// <auto-generated>
-// This code was generated by Speakeasy (https://speakeasy.com). DO NOT EDIT.
-//
-// Changes to this file may cause incorrect behavior and will be lost when
-// the code is regenerated.
-// </auto-generated>
-//------------------------------------------------------------------------------
-#nullable enable
-namespace LukeHagar.PlexAPI.SDK.Models.Errors
-{
-    using LukeHagar.PlexAPI.SDK.Models.Errors;
-    using LukeHagar.PlexAPI.SDK.Utils;
-    using Newtonsoft.Json;
-    using System.Collections.Generic;
-    using System.Net.Http;
-    using System;
-    
-    /// <summary>
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class GetMetaDataByRatingKeyUnauthorized : Exception
-    {
-
-        [JsonProperty("errors")]
-        public List<GetMetaDataByRatingKeyLibraryErrors>? Errors { get; set; }
-
-        /// <summary>
-        /// Raw HTTP response; suitable for custom response parsing
-        /// </summary>
-        [JsonProperty("-")]
-        public HttpResponseMessage? RawResponse { get; set; }
-    }
-}

LukeHagar/PlexAPI/SDK/Models/Errors/GetMetadataChildrenBadRequest.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetMetadataChildrenBadRequestPayload
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class GetMetadataChildrenBadRequest : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetMetadataChildrenErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class GetMetadataChildrenBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetMetadataChildrenBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetMetadataChildrenBadRequest.Payload.Errors instead.")]
+        public List<GetMetadataChildrenErrors>? Errors { get; set; }
+
+        public GetMetadataChildrenBadRequest(
+            GetMetadataChildrenBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetMetadataChildrenUnauthorized.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetMetadataChildrenUnauthorizedPayload
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class GetMetadataChildrenUnauthorized : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetMetadataChildrenLibraryErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class GetMetadataChildrenUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetMetadataChildrenUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetMetadataChildrenUnauthorized.Payload.Errors instead.")]
+        public List<GetMetadataChildrenLibraryErrors>? Errors { get; set; }
+
+        public GetMetadataChildrenUnauthorized(
+            GetMetadataChildrenUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetMyPlexAccountBadRequest.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetMyPlexAccountBadRequestPayload
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class GetMyPlexAccountBadRequest : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetMyPlexAccountErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class GetMyPlexAccountBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetMyPlexAccountBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetMyPlexAccountBadRequest.Payload.Errors instead.")]
+        public List<GetMyPlexAccountErrors>? Errors { get; set; }
+
+        public GetMyPlexAccountBadRequest(
+            GetMyPlexAccountBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetMyPlexAccountUnauthorized.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetMyPlexAccountUnauthorizedPayload
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class GetMyPlexAccountUnauthorized : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetMyPlexAccountServerErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class GetMyPlexAccountUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetMyPlexAccountUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetMyPlexAccountUnauthorized.Payload.Errors instead.")]
+        public List<GetMyPlexAccountServerErrors>? Errors { get; set; }
+
+        public GetMyPlexAccountUnauthorized(
+            GetMyPlexAccountUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetPinBadRequest.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetPinBadRequestPayload
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class GetPinBadRequest : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetPinErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class GetPinBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetPinBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetPinBadRequest.Payload.Errors instead.")]
+        public List<GetPinErrors>? Errors { get; set; }
+
+        public GetPinBadRequest(
+            GetPinBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetPlaylistBadRequest.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetPlaylistBadRequestPayload
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class GetPlaylistBadRequest : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetPlaylistErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class GetPlaylistBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetPlaylistBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetPlaylistBadRequest.Payload.Errors instead.")]
+        public List<GetPlaylistErrors>? Errors { get; set; }
+
+        public GetPlaylistBadRequest(
+            GetPlaylistBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetPlaylistContentsBadRequest.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetPlaylistContentsBadRequestPayload
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class GetPlaylistContentsBadRequest : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetPlaylistContentsErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class GetPlaylistContentsBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetPlaylistContentsBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetPlaylistContentsBadRequest.Payload.Errors instead.")]
+        public List<GetPlaylistContentsErrors>? Errors { get; set; }
+
+        public GetPlaylistContentsBadRequest(
+            GetPlaylistContentsBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetPlaylistContentsUnauthorized.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetPlaylistContentsUnauthorizedPayload
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class GetPlaylistContentsUnauthorized : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetPlaylistContentsPlaylistsErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class GetPlaylistContentsUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetPlaylistContentsUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetPlaylistContentsUnauthorized.Payload.Errors instead.")]
+        public List<GetPlaylistContentsPlaylistsErrors>? Errors { get; set; }
+
+        public GetPlaylistContentsUnauthorized(
+            GetPlaylistContentsUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetPlaylistUnauthorized.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetPlaylistUnauthorizedPayload
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class GetPlaylistUnauthorized : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetPlaylistPlaylistsErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class GetPlaylistUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetPlaylistUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetPlaylistUnauthorized.Payload.Errors instead.")]
+        public List<GetPlaylistPlaylistsErrors>? Errors { get; set; }
+
+        public GetPlaylistUnauthorized(
+            GetPlaylistUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetPlaylistsBadRequest.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetPlaylistsBadRequestPayload
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class GetPlaylistsBadRequest : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetPlaylistsErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class GetPlaylistsBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetPlaylistsBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetPlaylistsBadRequest.Payload.Errors instead.")]
+        public List<GetPlaylistsErrors>? Errors { get; set; }
+
+        public GetPlaylistsBadRequest(
+            GetPlaylistsBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetPlaylistsUnauthorized.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetPlaylistsUnauthorizedPayload
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class GetPlaylistsUnauthorized : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetPlaylistsPlaylistsErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class GetPlaylistsUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetPlaylistsUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetPlaylistsUnauthorized.Payload.Errors instead.")]
+        public List<GetPlaylistsPlaylistsErrors>? Errors { get; set; }
+
+        public GetPlaylistsUnauthorized(
+            GetPlaylistsUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetRecentlyAddedLibraryBadRequest.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetRecentlyAddedLibraryBadRequestPayload
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class GetRecentlyAddedLibraryBadRequest : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetRecentlyAddedLibraryErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class GetRecentlyAddedLibraryBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetRecentlyAddedLibraryBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetRecentlyAddedLibraryBadRequest.Payload.Errors instead.")]
+        public List<GetRecentlyAddedLibraryErrors>? Errors { get; set; }
+
+        public GetRecentlyAddedLibraryBadRequest(
+            GetRecentlyAddedLibraryBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetRecentlyAddedLibraryUnauthorized.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetRecentlyAddedLibraryUnauthorizedPayload
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class GetRecentlyAddedLibraryUnauthorized : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetRecentlyAddedLibraryLibraryErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class GetRecentlyAddedLibraryUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetRecentlyAddedLibraryUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetRecentlyAddedLibraryUnauthorized.Payload.Errors instead.")]
+        public List<GetRecentlyAddedLibraryLibraryErrors>? Errors { get; set; }
+
+        public GetRecentlyAddedLibraryUnauthorized(
+            GetRecentlyAddedLibraryUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetRefreshLibraryMetadataBadRequest.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetRefreshLibraryMetadataBadRequestPayload
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class GetRefreshLibraryMetadataBadRequest : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetRefreshLibraryMetadataErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class GetRefreshLibraryMetadataBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetRefreshLibraryMetadataBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetRefreshLibraryMetadataBadRequest.Payload.Errors instead.")]
+        public List<GetRefreshLibraryMetadataErrors>? Errors { get; set; }
+
+        public GetRefreshLibraryMetadataBadRequest(
+            GetRefreshLibraryMetadataBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetRefreshLibraryMetadataUnauthorized.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetRefreshLibraryMetadataUnauthorizedPayload
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class GetRefreshLibraryMetadataUnauthorized : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetRefreshLibraryMetadataLibraryErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class GetRefreshLibraryMetadataUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetRefreshLibraryMetadataUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetRefreshLibraryMetadataUnauthorized.Payload.Errors instead.")]
+        public List<GetRefreshLibraryMetadataLibraryErrors>? Errors { get; set; }
+
+        public GetRefreshLibraryMetadataUnauthorized(
+            GetRefreshLibraryMetadataUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetResizedPhotoBadRequest.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetResizedPhotoBadRequestPayload
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class GetResizedPhotoBadRequest : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetResizedPhotoErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Bad Request - A parameter was not specified, or was specified incorrectly.
+    /// </summary>
+    public class GetResizedPhotoBadRequest : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetResizedPhotoBadRequestPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetResizedPhotoBadRequest.Payload.Errors instead.")]
+        public List<GetResizedPhotoErrors>? Errors { get; set; }
+
+        public GetResizedPhotoBadRequest(
+            GetResizedPhotoBadRequestPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetResizedPhotoUnauthorized.cs

@@ -12,16 +12,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Models.Errors;
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
+    using System;
     using System.Collections.Generic;
     using System.Net.Http;
-    using System;
 
-    /// <summary>
+    public class GetResizedPhotoUnauthorizedPayload
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class GetResizedPhotoUnauthorized : Exception
     {
-
         [JsonProperty("errors")]
         public List<GetResizedPhotoServerErrors>? Errors { get; set; }
 
@@ -31,4 +27,32 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
         [JsonProperty("-")]
         public HttpResponseMessage? RawResponse { get; set; }
     }
+
+    /// <summary>
+    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
+    /// </summary>
+    public class GetResizedPhotoUnauthorized : PlexAPIError
+    {
+        /// <summary>
+        ///  The original data that was passed to this exception.
+        /// </summary>
+        public GetResizedPhotoUnauthorizedPayload Payload { get; }
+
+        [Obsolete("This field will be removed in a future release, please migrate away from it as soon as possible. Use GetResizedPhotoUnauthorized.Payload.Errors instead.")]
+        public List<GetResizedPhotoServerErrors>? Errors { get; set; }
+
+        public GetResizedPhotoUnauthorized(
+            GetResizedPhotoUnauthorizedPayload payload,
+            HttpResponseMessage rawResponse,
+            string body
+        ): base("API error occurred", rawResponse, body)
+        {
+           Payload = payload;
+
+           #pragma warning disable CS0618
+           Errors = payload.Errors;
+           #pragma warning restore CS0618
+        }
+    }
+
 }