ci: regenerated with OpenAPI Doc , Speakeasy CLI 1.615.2

When I manually trigger the SDK generation for C# from the speakeasy dashboard. The pipeline fails, see: https://github.com/LukeHagar/plexcsharp/actions/runs/10970974198/job/30465496056 but it trips over the `sourceDirectory` property which should be allowed to be empty:

See: https://www.speakeasy.com/docs/gen-reference#sourcedirectory => C# =>  `sourceDirectory`

So it's a bug in the validating process which incorrectly marks an empty `sourceDirectory` as 
invalid

.github/workflows/sdk_generation.yaml

@@ -24,6 +24,7 @@ jobs:
       mode: direct
       set_version: ${{ github.event.inputs.set_version }}
       speakeasy_version: latest
+      dotnet_version: "8.x"
     secrets:
       github_access_token: ${{ secrets.GITHUB_TOKEN }}
       nuget_api_key: ${{ secrets.NUGET_API_KEY }}

.gitignore

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

.idea/.idea.LukeHagar.PlexAPI.SDK/.idea/.name

@@ -0,0 +1 @@
+LukeHagar.PlexAPI.SDK

.idea/.idea.LukeHagar.PlexAPI.SDK/.idea/encodings.xml

@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="Encoding" addBOMForNewFiles="with BOM under Windows, with no BOM otherwise" />
+</project>

.idea/.idea.LukeHagar.PlexAPI.SDK/.idea/indexLayout.xml

@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="UserContentModel">
+    <attachedFolders />
+    <explicitIncludes />
+    <explicitExcludes />
+  </component>
+</project>

.idea/.idea.LukeHagar.PlexAPI.SDK/.idea/projectSettingsUpdater.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="RiderProjectSettingsUpdater">
+    <option name="vcsConfiguration" value="3" />
+  </component>
+</project>

.idea/.idea.LukeHagar.PlexAPI.SDK/.idea/vcs.xml

@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project version="4">
+  <component name="VcsDirectoryMappings">
+    <mapping directory="$PROJECT_DIR$" vcs="Git" />
+  </component>
+</project>

.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.6.10
+  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,7 +45,9 @@ csharp:
   includeDebugSymbols: true
   inputModelSuffix: input
   maxMethodParams: 4
+  methodArguments: infer-optional-args
   outputModelSuffix: output
   packageName: LukeHagar.PlexAPI.SDK
   packageTags: Plex Media Server SDK
   responseFormat: envelope
+  sourceDirectory: ""

.speakeasy/workflow.lock

@@ -1,4 +1,4 @@
-speakeasyVersion: 1.398.0
+speakeasyVersion: 1.615.2
 sources:
     my-source:
         sourceNamespace: my-source
@@ -16,19 +16,19 @@ sources:
             - main
     plexapi:
         sourceNamespace: plexapi
-        sourceRevisionDigest: sha256:533fe97486e3fe2d84e890b7bbcdba4543d415e45181386154e011861f6da36f
-        sourceBlobDigest: sha256:f7e2709f52370dff16c1851a7a4e44a89f2e978e9cae335bffc10625950b3bd9
+        sourceRevisionDigest: sha256:5125adfea1b0daea399c6ecf755e32795de6b4131465ae6a1f32ad73b3bc7787
+        sourceBlobDigest: sha256:95cea18b6e5f7d76d35db0aba5bcb59e72cf204451a2b09a99be0e3e9ec1f4c0
         tags:
             - latest
-            - main
+            - speakeasy-sdk-regen-1757895932
 targets:
     plexcsharp:
         source: plexapi
         sourceNamespace: plexapi
-        sourceRevisionDigest: sha256:533fe97486e3fe2d84e890b7bbcdba4543d415e45181386154e011861f6da36f
-        sourceBlobDigest: sha256:f7e2709f52370dff16c1851a7a4e44a89f2e978e9cae335bffc10625950b3bd9
+        sourceRevisionDigest: sha256:5125adfea1b0daea399c6ecf755e32795de6b4131465ae6a1f32ad73b3bc7787
+        sourceBlobDigest: sha256:95cea18b6e5f7d76d35db0aba5bcb59e72cf204451a2b09a99be0e3e9ec1f4c0
         codeSamplesNamespace: code-samples-csharp-plexcsharp
-        codeSamplesRevisionDigest: sha256:af59392edb38e357e18bfaf554d4ed68f60f7c4f7b8024f5b5993115be763448
+        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/>
@@ -74,19 +74,12 @@ namespace LukeHagar.PlexAPI.SDK
     {
         public SDKConfig SDKConfiguration { get; private set; }
         private const string _language = "csharp";
-        private const string _sdkVersion = "0.6.10";
-        private const string _sdkGenVersion = "2.415.8";
+        private const string _sdkVersion = "0.17.0";
+        private const string _sdkGenVersion = "2.698.4";
         private const string _openapiDocVersion = "0.0.3";
-        private const string _userAgent = "speakeasy-sdk/csharp 0.6.10 2.415.8 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;
         }
 
@@ -97,21 +90,21 @@ namespace LukeHagar.PlexAPI.SDK
             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);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await _client.SendAsync(httpRequest);
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -144,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,
@@ -154,45 +157,61 @@ namespace LukeHagar.PlexAPI.SDK
                     response.Object = obj;
                     return response;
                 }
-                else
-                {
-                    throw new 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);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    GetServerActivitiesBadRequestPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetServerActivitiesBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetServerActivitiesBadRequestPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    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);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    GetServerActivitiesUnauthorizedPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetServerActivitiesUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetServerActivitiesUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    payload.RawResponse = httpResponse;
+                    throw new GetServerActivitiesUnauthorized(payload, httpResponse, httpResponseBody);
                 }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
-            else if(responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
             {
-                throw new SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
-            else
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
             {
-                throw new SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                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)
@@ -205,21 +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);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await _client.SendAsync(httpRequest);
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -249,7 +268,7 @@ namespace LukeHagar.PlexAPI.SDK
             var contentType = httpResponse.Content.Headers.ContentType?.MediaType;
             int responseStatusCode = (int)httpResponse.StatusCode;
             if(responseStatusCode == 200)
-            {                
+            {
                 return new CancelServerActivitiesResponse()
                 {
                     StatusCode = responseStatusCode,
@@ -261,36 +280,54 @@ namespace LukeHagar.PlexAPI.SDK
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<CancelServerActivitiesBadRequest>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    CancelServerActivitiesBadRequestPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<CancelServerActivitiesBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into CancelServerActivitiesBadRequestPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    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);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    CancelServerActivitiesUnauthorizedPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<CancelServerActivitiesUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into CancelServerActivitiesUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    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 || responseStatusCode >= 500 && responseStatusCode < 600)
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
             {
-                throw new SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
-            else
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
             {
-                throw new SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                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/>
@@ -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(string? xPlexClientIdentifier = null, PostUsersSignInDataRequestBody? requestBody = null, string? serverUrl = null);
+        Task<PostUsersSignInDataResponse> PostUsersSignInDataAsync(PostUsersSignInDataRequest request, string? serverUrl = null);
     }
 
     /// <summary>
@@ -85,29 +85,22 @@ namespace LukeHagar.PlexAPI.SDK
         /// List of server URLs available for the getTokenDetails operation.
         /// </summary>
         public static readonly string[] GetTokenDetailsServerList = {
-            "https://plex.tv/api/v2/",
+            "https://plex.tv/api/v2",
         };
         /// <summary>
         /// List of server URLs available for the post-users-sign-in-data operation.
         /// </summary>
         public static readonly string[] PostUsersSignInDataServerList = {
-            "https://plex.tv/api/v2/",
+            "https://plex.tv/api/v2",
         };
         public SDKConfig SDKConfiguration { get; private set; }
         private const string _language = "csharp";
-        private const string _sdkVersion = "0.6.10";
-        private const string _sdkGenVersion = "2.415.8";
+        private const string _sdkVersion = "0.17.0";
+        private const string _sdkGenVersion = "2.698.4";
         private const string _openapiDocVersion = "0.0.3";
-        private const string _userAgent = "speakeasy-sdk/csharp 0.6.10 2.415.8 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;
         }
 
@@ -122,21 +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);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await _client.SendAsync(httpRequest);
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -166,7 +159,7 @@ namespace LukeHagar.PlexAPI.SDK
             var contentType = httpResponse.Content.Headers.ContentType?.MediaType;
             int responseStatusCode = (int)httpResponse.StatusCode;
             if(responseStatusCode == 200)
-            {                
+            {
                 return new GetTransientTokenResponse()
                 {
                     StatusCode = responseStatusCode,
@@ -178,36 +171,54 @@ namespace LukeHagar.PlexAPI.SDK
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<GetTransientTokenBadRequest>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    GetTransientTokenBadRequestPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetTransientTokenBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetTransientTokenBadRequestPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    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);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    GetTransientTokenUnauthorizedPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetTransientTokenUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetTransientTokenUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    payload.RawResponse = httpResponse;
+                    throw new GetTransientTokenUnauthorized(payload, httpResponse, httpResponseBody);
                 }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
-            else if(responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
             {
-                throw new SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
-            else
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
             {
-                throw new SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                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)
@@ -220,21 +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);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await _client.SendAsync(httpRequest);
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -264,7 +275,7 @@ namespace LukeHagar.PlexAPI.SDK
             var contentType = httpResponse.Content.Headers.ContentType?.MediaType;
             int responseStatusCode = (int)httpResponse.StatusCode;
             if(responseStatusCode == 200)
-            {                
+            {
                 return new GetSourceConnectionInformationResponse()
                 {
                     StatusCode = responseStatusCode,
@@ -276,36 +287,54 @@ namespace LukeHagar.PlexAPI.SDK
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<GetSourceConnectionInformationBadRequest>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    GetSourceConnectionInformationBadRequestPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetSourceConnectionInformationBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetSourceConnectionInformationBadRequestPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    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);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    GetSourceConnectionInformationUnauthorizedPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetSourceConnectionInformationUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetSourceConnectionInformationUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    payload.RawResponse = httpResponse;
+                    throw new GetSourceConnectionInformationUnauthorized(payload, httpResponse, httpResponseBody);
                 }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
-            else if(responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
             {
-                throw new SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
-            else
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
             {
-                throw new SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                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)
@@ -320,21 +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);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await _client.SendAsync(httpRequest);
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -367,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,
@@ -377,66 +416,77 @@ namespace LukeHagar.PlexAPI.SDK
                     response.UserPlexAccount = obj;
                     return response;
                 }
-                else
-                {
-                    throw new 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);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    GetTokenDetailsBadRequestPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetTokenDetailsBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetTokenDetailsBadRequestPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    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);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    GetTokenDetailsUnauthorizedPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetTokenDetailsUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetTokenDetailsUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    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 || responseStatusCode >= 500 && responseStatusCode < 600)
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
             {
-                throw new SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
-            else
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
             {
-                throw new SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                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(string? xPlexClientIdentifier = null, PostUsersSignInDataRequestBody? requestBody = null, string? serverUrl = null)
+        public async Task<PostUsersSignInDataResponse> PostUsersSignInDataAsync(PostUsersSignInDataRequest request, string? serverUrl = null)
         {
-            var request = new PostUsersSignInDataRequest()
-            {
-                XPlexClientIdentifier = xPlexClientIdentifier,
-                RequestBody = requestBody,
-            };
-            request.XPlexClientIdentifier ??= SDKConfiguration.XPlexClientIdentifier;
-            
             string baseUrl = Utilities.TemplateUrl(PostUsersSignInDataServerList[0], new Dictionary<string, string>(){
             });
             if (serverUrl != null)
             {
                 baseUrl = serverUrl;
             }
-            var urlString = URLBuilder.Build(baseUrl, "/users/signin", request);
+
+            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);
             if (serializedBody != null)
@@ -444,14 +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);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await _client.SendAsync(httpRequest);
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -484,7 +534,17 @@ namespace LukeHagar.PlexAPI.SDK
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<PostUsersSignInDataUserPlexAccount>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    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,
@@ -494,45 +554,61 @@ namespace LukeHagar.PlexAPI.SDK
                     response.UserPlexAccount = obj;
                     return response;
                 }
-                else
-                {
-                    throw new 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.Ignore);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    PostUsersSignInDataBadRequestPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<PostUsersSignInDataBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into PostUsersSignInDataBadRequestPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    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.Ignore);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    PostUsersSignInDataUnauthorizedPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<PostUsersSignInDataUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into PostUsersSignInDataUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    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 || responseStatusCode >= 500 && responseStatusCode < 600)
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
             {
-                throw new SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
-            else
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
             {
-                throw new SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                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/>
@@ -101,19 +103,12 @@ namespace LukeHagar.PlexAPI.SDK
     {
         public SDKConfig SDKConfiguration { get; private set; }
         private const string _language = "csharp";
-        private const string _sdkVersion = "0.6.10";
-        private const string _sdkGenVersion = "2.415.8";
+        private const string _sdkVersion = "0.17.0";
+        private const string _sdkGenVersion = "2.698.4";
         private const string _openapiDocVersion = "0.0.3";
-        private const string _userAgent = "speakeasy-sdk/csharp 0.6.10 2.415.8 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;
         }
 
@@ -124,21 +119,21 @@ namespace LukeHagar.PlexAPI.SDK
             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);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await _client.SendAsync(httpRequest);
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -171,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,
@@ -181,45 +186,61 @@ namespace LukeHagar.PlexAPI.SDK
                     response.Object = obj;
                     return response;
                 }
-                else
-                {
-                    throw new 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);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    GetButlerTasksBadRequestPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetButlerTasksBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetButlerTasksBadRequestPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    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);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    GetButlerTasksUnauthorizedPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetButlerTasksUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetButlerTasksUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    payload.RawResponse = httpResponse;
+                    throw new GetButlerTasksUnauthorized(payload, httpResponse, httpResponseBody);
                 }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
-            else if(responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
             {
-                throw new SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
-            else
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
             {
-                throw new SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                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()
@@ -229,21 +250,21 @@ namespace LukeHagar.PlexAPI.SDK
             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);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await _client.SendAsync(httpRequest);
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -273,7 +294,7 @@ namespace LukeHagar.PlexAPI.SDK
             var contentType = httpResponse.Content.Headers.ContentType?.MediaType;
             int responseStatusCode = (int)httpResponse.StatusCode;
             if(responseStatusCode == 200)
-            {                
+            {
                 return new StartAllTasksResponse()
                 {
                     StatusCode = responseStatusCode,
@@ -285,36 +306,54 @@ namespace LukeHagar.PlexAPI.SDK
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<StartAllTasksBadRequest>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    StartAllTasksBadRequestPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<StartAllTasksBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into StartAllTasksBadRequestPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    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);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    StartAllTasksUnauthorizedPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<StartAllTasksUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into StartAllTasksUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    payload.RawResponse = httpResponse;
+                    throw new StartAllTasksUnauthorized(payload, httpResponse, httpResponseBody);
                 }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
-            else if(responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
             {
-                throw new SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
-            else
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
             {
-                throw new SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                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()
@@ -324,21 +363,21 @@ namespace LukeHagar.PlexAPI.SDK
             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);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await _client.SendAsync(httpRequest);
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -368,7 +407,7 @@ namespace LukeHagar.PlexAPI.SDK
             var contentType = httpResponse.Content.Headers.ContentType?.MediaType;
             int responseStatusCode = (int)httpResponse.StatusCode;
             if(responseStatusCode == 200)
-            {                
+            {
                 return new StopAllTasksResponse()
                 {
                     StatusCode = responseStatusCode,
@@ -380,36 +419,54 @@ namespace LukeHagar.PlexAPI.SDK
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<StopAllTasksBadRequest>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    StopAllTasksBadRequestPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<StopAllTasksBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into StopAllTasksBadRequestPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    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);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    StopAllTasksUnauthorizedPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<StopAllTasksUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into StopAllTasksUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    payload.RawResponse = httpResponse;
+                    throw new StopAllTasksUnauthorized(payload, httpResponse, httpResponseBody);
                 }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
-            else if(responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
             {
-                throw new SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
-            else
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
             {
-                throw new SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                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)
@@ -422,21 +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);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await _client.SendAsync(httpRequest);
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -466,7 +523,7 @@ namespace LukeHagar.PlexAPI.SDK
             var contentType = httpResponse.Content.Headers.ContentType?.MediaType;
             int responseStatusCode = (int)httpResponse.StatusCode;
             if(new List<int>{200, 202}.Contains(responseStatusCode))
-            {                
+            {
                 return new StartTaskResponse()
                 {
                     StatusCode = responseStatusCode,
@@ -478,36 +535,54 @@ namespace LukeHagar.PlexAPI.SDK
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<StartTaskBadRequest>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    StartTaskBadRequestPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<StartTaskBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into StartTaskBadRequestPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    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);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    StartTaskUnauthorizedPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<StartTaskUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into StartTaskUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    payload.RawResponse = httpResponse;
+                    throw new StartTaskUnauthorized(payload, httpResponse, httpResponseBody);
                 }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
-            else if(responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
             {
-                throw new SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
-            else
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
             {
-                throw new SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                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)
@@ -520,21 +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);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await _client.SendAsync(httpRequest);
+                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)
@@ -564,7 +639,7 @@ namespace LukeHagar.PlexAPI.SDK
             var contentType = httpResponse.Content.Headers.ContentType?.MediaType;
             int responseStatusCode = (int)httpResponse.StatusCode;
             if(responseStatusCode == 200)
-            {                
+            {
                 return new StopTaskResponse()
                 {
                     StatusCode = responseStatusCode,
@@ -576,36 +651,54 @@ namespace LukeHagar.PlexAPI.SDK
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<StopTaskBadRequest>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    StopTaskBadRequestPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<StopTaskBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into StopTaskBadRequestPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    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);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    StopTaskUnauthorizedPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<StopTaskUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into StopTaskUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    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 || responseStatusCode >= 500 && responseStatusCode < 600)
+            else if(responseStatusCode == 404 || responseStatusCode >= 400 && responseStatusCode < 500)
             {
-                throw new SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
-            else
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
             {
-                throw new SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                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/Hooks/SDKHooks.cs

@@ -52,7 +52,7 @@ namespace LukeHagar.PlexAPI.SDK.Hooks
         {
             this.afterErrorHooks.Add(hook);
         }
-
+        
         public (string, ISpeakeasyHttpClient) SDKInit(string baseUrl, ISpeakeasyHttpClient client)
         {
             var urlAndClient = (baseUrl, client);
@@ -68,7 +68,7 @@ namespace LukeHagar.PlexAPI.SDK.Hooks
             }
             return urlAndClient;
         }
-
+        
         public async Task<HttpRequestMessage> BeforeRequestAsync(BeforeRequestContext hookCtx, HttpRequestMessage request)
         {
             foreach (var hook in this.beforeRequestHooks)

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/>
@@ -41,6 +41,16 @@ namespace LukeHagar.PlexAPI.SDK
         /// </summary>
         Task<GetGlobalHubsResponse> GetGlobalHubsAsync(double? count = null, OnlyTransient? onlyTransient = null);
 
+        /// <summary>
+        /// Get Recently Added
+        /// 
+        /// <remarks>
+        /// This endpoint will return the recently added content.<br/>
+        /// 
+        /// </remarks>
+        /// </summary>
+        Task<GetRecentlyAddedResponse> GetRecentlyAddedAsync(GetRecentlyAddedRequest request);
+
         /// <summary>
         /// Get library specific hubs
         /// 
@@ -63,19 +73,12 @@ namespace LukeHagar.PlexAPI.SDK
     {
         public SDKConfig SDKConfiguration { get; private set; }
         private const string _language = "csharp";
-        private const string _sdkVersion = "0.6.10";
-        private const string _sdkGenVersion = "2.415.8";
+        private const string _sdkVersion = "0.17.0";
+        private const string _sdkGenVersion = "2.698.4";
         private const string _openapiDocVersion = "0.0.3";
-        private const string _userAgent = "speakeasy-sdk/csharp 0.6.10 2.415.8 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;
         }
 
@@ -90,21 +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);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await _client.SendAsync(httpRequest);
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -137,7 +140,17 @@ namespace LukeHagar.PlexAPI.SDK
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<GetGlobalHubsResponseBody>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
+                    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,
@@ -147,45 +160,149 @@ namespace LukeHagar.PlexAPI.SDK
                     response.Object = obj;
                     return response;
                 }
-                else
-                {
-                    throw new 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.Ignore);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    GetGlobalHubsBadRequestPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetGlobalHubsBadRequestPayload>(httpResponseBody, NullValueHandling.Include);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetGlobalHubsBadRequestPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    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.Ignore);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    GetGlobalHubsUnauthorizedPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetGlobalHubsUnauthorizedPayload>(httpResponseBody, NullValueHandling.Include);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetGlobalHubsUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    payload.RawResponse = httpResponse;
+                    throw new GetGlobalHubsUnauthorized(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<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", SDKConfiguration.UserAgent);
+
+            if (SDKConfiguration.SecuritySource != null)
+            {
+                httpRequest = new SecurityMetadata(SDKConfiguration.SecuritySource).Apply(httpRequest);
+            }
+
+            var hookCtx = new HookContext(SDKConfiguration, baseUrl, "get-recently-added", new List<string> {  }, SDKConfiguration.SecuritySource);
+
+            httpRequest = await this.SDKConfiguration.Hooks.BeforeRequestAsync(new BeforeRequestContext(hookCtx), httpRequest);
+
+            HttpResponseMessage httpResponse;
+            try
+            {
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
+                int _statusCode = (int)httpResponse.StatusCode;
+
+                if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
+                {
+                    var _httpResponse = await this.SDKConfiguration.Hooks.AfterErrorAsync(new AfterErrorContext(hookCtx), httpResponse, null);
+                    if (_httpResponse != null)
+                    {
+                        httpResponse = _httpResponse;
+                    }
+                }
+            }
+            catch (Exception error)
+            {
+                var _httpResponse = await this.SDKConfiguration.Hooks.AfterErrorAsync(new AfterErrorContext(hookCtx), null, error);
+                if (_httpResponse != null)
+                {
+                    httpResponse = _httpResponse;
                 }
                 else
                 {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    throw;
                 }
             }
-            else if(responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
+
+            httpResponse = await this.SDKConfiguration.Hooks.AfterSuccessAsync(new AfterSuccessContext(hookCtx), httpResponse);
+
+            var contentType = httpResponse.Content.Headers.ContentType?.MediaType;
+            int responseStatusCode = (int)httpResponse.StatusCode;
+            if(responseStatusCode == 200)
             {
-                throw new SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                if(Utilities.IsContentTypeMatch("application/json", contentType))
+                {
+                    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,
+                        ContentType = contentType,
+                        RawResponse = httpResponse
+                    };
+                    response.Object = obj;
+                    return response;
+                }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
-            else
+            else if(responseStatusCode == 400 || responseStatusCode == 401 || responseStatusCode >= 400 && responseStatusCode < 500)
             {
-                throw new SDKException("Unknown status code received", 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", httpResponse, await httpResponse.Content.ReadAsStringAsync());
         }
 
         public async Task<GetLibraryHubsResponse> GetLibraryHubsAsync(double sectionId, double? count = null, QueryParamOnlyTransient? onlyTransient = null)
@@ -200,21 +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);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await _client.SendAsync(httpRequest);
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -247,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,
@@ -257,45 +384,61 @@ namespace LukeHagar.PlexAPI.SDK
                     response.Object = obj;
                     return response;
                 }
-                else
-                {
-                    throw new 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);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    GetLibraryHubsBadRequestPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetLibraryHubsBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetLibraryHubsBadRequestPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    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);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    GetLibraryHubsUnauthorizedPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetLibraryHubsUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetLibraryHubsUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    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 || responseStatusCode >= 500 && responseStatusCode < 600)
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
             {
-                throw new SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
-            else
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
             {
-                throw new SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                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/>
@@ -46,13 +48,13 @@ namespace LukeHagar.PlexAPI.SDK
         /// Logging a multi-line message
         /// 
         /// <remarks>
-        /// This endpoint allows for the batch addition of log entries to the main Plex Media Server log.  <br/>
-        /// It accepts a text/plain request body, where each line represents a distinct log entry.  <br/>
-        /// Each log entry consists of URL-encoded key-value pairs, specifying log attributes such as &apos;level&apos;, &apos;message&apos;, and &apos;source&apos;.  <br/>
+        /// This endpoint allows for the batch addition of log entries to the main Plex Media Server log.<br/>
+        /// It accepts a text/plain request body, where each line represents a distinct log entry.<br/>
+        /// Each log entry consists of URL-encoded key-value pairs, specifying log attributes such as &apos;level&apos;, &apos;message&apos;, and &apos;source&apos;.<br/>
         /// <br/>
-        /// Log entries are separated by a newline character (`\n`).  <br/>
-        /// Each entry&apos;s parameters should be URL-encoded to ensure accurate parsing and handling of special characters.  <br/>
-        /// This method is efficient for logging multiple entries in a single API call, reducing the overhead of multiple individual requests.  <br/>
+        /// Log entries are separated by a newline character (`\n`).<br/>
+        /// Each entry&apos;s parameters should be URL-encoded to ensure accurate parsing and handling of special characters.<br/>
+        /// This method is efficient for logging multiple entries in a single API call, reducing the overhead of multiple individual requests.<br/>
         /// <br/>
         /// The &apos;level&apos; parameter specifies the log entry&apos;s severity or importance, with the following integer values:<br/>
         /// - `0`: Error - Critical issues that require immediate attention.<br/>
@@ -94,19 +96,12 @@ namespace LukeHagar.PlexAPI.SDK
     {
         public SDKConfig SDKConfiguration { get; private set; }
         private const string _language = "csharp";
-        private const string _sdkVersion = "0.6.10";
-        private const string _sdkGenVersion = "2.415.8";
+        private const string _sdkVersion = "0.17.0";
+        private const string _sdkGenVersion = "2.698.4";
         private const string _openapiDocVersion = "0.0.3";
-        private const string _userAgent = "speakeasy-sdk/csharp 0.6.10 2.415.8 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;
         }
 
@@ -122,21 +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);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await _client.SendAsync(httpRequest);
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -166,7 +161,7 @@ namespace LukeHagar.PlexAPI.SDK
             var contentType = httpResponse.Content.Headers.ContentType?.MediaType;
             int responseStatusCode = (int)httpResponse.StatusCode;
             if(responseStatusCode == 200)
-            {                
+            {
                 return new LogLineResponse()
                 {
                     StatusCode = responseStatusCode,
@@ -178,36 +173,54 @@ namespace LukeHagar.PlexAPI.SDK
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<LogLineBadRequest>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    LogLineBadRequestPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<LogLineBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into LogLineBadRequestPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    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);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    LogLineUnauthorizedPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<LogLineUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into LogLineUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    payload.RawResponse = httpResponse;
+                    throw new LogLineUnauthorized(payload, httpResponse, httpResponseBody);
                 }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
-            else if(responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
             {
-                throw new SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
-            else
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
             {
-                throw new SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                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)
@@ -217,7 +230,7 @@ namespace LukeHagar.PlexAPI.SDK
             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)
@@ -225,19 +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);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await _client.SendAsync(httpRequest);
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -267,7 +280,7 @@ namespace LukeHagar.PlexAPI.SDK
             var contentType = httpResponse.Content.Headers.ContentType?.MediaType;
             int responseStatusCode = (int)httpResponse.StatusCode;
             if(responseStatusCode == 200)
-            {                
+            {
                 return new LogMultiLineResponse()
                 {
                     StatusCode = responseStatusCode,
@@ -279,36 +292,54 @@ namespace LukeHagar.PlexAPI.SDK
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<LogMultiLineBadRequest>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    LogMultiLineBadRequestPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<LogMultiLineBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into LogMultiLineBadRequestPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    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);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    LogMultiLineUnauthorizedPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<LogMultiLineUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into LogMultiLineUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    payload.RawResponse = httpResponse;
+                    throw new LogMultiLineUnauthorized(payload, httpResponse, httpResponseBody);
                 }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
-            else if(responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
             {
-                throw new SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
-            else
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
             {
-                throw new SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                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()
@@ -318,21 +349,21 @@ namespace LukeHagar.PlexAPI.SDK
             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);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await _client.SendAsync(httpRequest);
+                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)
@@ -362,7 +393,7 @@ namespace LukeHagar.PlexAPI.SDK
             var contentType = httpResponse.Content.Headers.ContentType?.MediaType;
             int responseStatusCode = (int)httpResponse.StatusCode;
             if(responseStatusCode == 200)
-            {                
+            {
                 return new EnablePaperTrailResponse()
                 {
                     StatusCode = responseStatusCode,
@@ -374,36 +405,54 @@ namespace LukeHagar.PlexAPI.SDK
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<EnablePaperTrailBadRequest>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    EnablePaperTrailBadRequestPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<EnablePaperTrailBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into EnablePaperTrailBadRequestPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    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);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    EnablePaperTrailUnauthorizedPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<EnablePaperTrailUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into EnablePaperTrailUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    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 || responseStatusCode >= 500 && responseStatusCode < 600)
+            else if(responseStatusCode == 403 || responseStatusCode >= 400 && responseStatusCode < 500)
             {
-                throw new SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
-            else
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
             {
-                throw new SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                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,14 +3,38 @@
   <PropertyGroup>
     <IsPackable>true</IsPackable>
     <PackageId>LukeHagar.PlexAPI.SDK</PackageId>
-    <Version>0.6.10</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-API: An Open API Spec for interacting with Plex.tv and Plex Media Server</Description>
+    <Description># Plex Media Server OpenAPI Specification<br/>
+<br/>
+An Open Source OpenAPI Specification for Plex Media Server<br/>
+<br/>
+Automation and SDKs provided by <a href="https://speakeasyapi.dev/">Speakeasy</a><br/>
+<br/>
+## Documentation<br/>
+<br/>
+<a href="https://plexapi.dev">API Documentation</a><br/>
+<br/>
+## 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 <a href="https://github.com/LukeHagar/plex-api-spec">main specification Repository</a>.<br/>
+<br/>
+| Language              | Repository                                        | Releases                                                                                         | Other                                                   |<br/>
+| --------------------- | ------------------------------------------------- | ------------------------------------------------------------------------------------------------ | ------------------------------------------------------- |<br/>
+| Python                | <a href="https://github.com/LukeHagar/plexpy">GitHub</a>     | <a href="https://pypi.org/project/plex-api-client/">PyPI</a>                                                | -                                                       |<br/>
+| 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                    | <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                  | <a href="https://github.com/LukeHagar/plexruby">GitHub</a>   | <a href="https://github.com/LukeHagar/plexruby/releases">Releases</a>                                       | -                                                       |<br/>
+| Swift                 | <a href="https://github.com/LukeHagar/plexswift">GitHub</a>  | <a href="https://github.com/LukeHagar/plexswift/releases">Releases</a>                                      | -                                                       |<br/>
+| PHP                   | <a href="https://github.com/LukeHagar/plexphp">GitHub</a>    | <a href="https://github.com/LukeHagar/plexphp/releases">Releases</a>                                        | -                                                       |<br/>
+| Java                  | <a href="https://github.com/LukeHagar/plexjava">GitHub</a>   | <a href="https://github.com/LukeHagar/plexjava/releases">Releases</a>                                       | -                                                       |<br/>
+| C#                    | <a href="https://github.com/LukeHagar/plexcsharp">GitHub</a> | <a href="https://github.com/LukeHagar/plexcsharp/releases">Releases</a>                                     | -<br/>
+</Description>
   </PropertyGroup>
 
   <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/>
@@ -90,19 +90,12 @@ namespace LukeHagar.PlexAPI.SDK
     {
         public SDKConfig SDKConfiguration { get; private set; }
         private const string _language = "csharp";
-        private const string _sdkVersion = "0.6.10";
-        private const string _sdkGenVersion = "2.415.8";
+        private const string _sdkVersion = "0.17.0";
+        private const string _sdkGenVersion = "2.698.4";
         private const string _openapiDocVersion = "0.0.3";
-        private const string _userAgent = "speakeasy-sdk/csharp 0.6.10 2.415.8 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;
         }
 
@@ -116,21 +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);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await _client.SendAsync(httpRequest);
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -160,7 +153,7 @@ namespace LukeHagar.PlexAPI.SDK
             var contentType = httpResponse.Content.Headers.ContentType?.MediaType;
             int responseStatusCode = (int)httpResponse.StatusCode;
             if(responseStatusCode == 200)
-            {                
+            {
                 return new MarkPlayedResponse()
                 {
                     StatusCode = responseStatusCode,
@@ -172,36 +165,54 @@ namespace LukeHagar.PlexAPI.SDK
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<MarkPlayedBadRequest>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    MarkPlayedBadRequestPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<MarkPlayedBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into MarkPlayedBadRequestPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    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);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    MarkPlayedUnauthorizedPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<MarkPlayedUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into MarkPlayedUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    payload.RawResponse = httpResponse;
+                    throw new MarkPlayedUnauthorized(payload, httpResponse, httpResponseBody);
                 }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
-            else if(responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
             {
-                throw new SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
-            else
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
             {
-                throw new SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                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)
@@ -214,21 +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);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await _client.SendAsync(httpRequest);
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -258,7 +269,7 @@ namespace LukeHagar.PlexAPI.SDK
             var contentType = httpResponse.Content.Headers.ContentType?.MediaType;
             int responseStatusCode = (int)httpResponse.StatusCode;
             if(responseStatusCode == 200)
-            {                
+            {
                 return new MarkUnplayedResponse()
                 {
                     StatusCode = responseStatusCode,
@@ -270,36 +281,54 @@ namespace LukeHagar.PlexAPI.SDK
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<MarkUnplayedBadRequest>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    MarkUnplayedBadRequestPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<MarkUnplayedBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into MarkUnplayedBadRequestPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    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);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    MarkUnplayedUnauthorizedPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<MarkUnplayedUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into MarkUnplayedUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    payload.RawResponse = httpResponse;
+                    throw new MarkUnplayedUnauthorized(payload, httpResponse, httpResponseBody);
                 }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
-            else if(responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
             {
-                throw new SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
-            else
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
             {
-                throw new SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                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)
@@ -314,21 +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);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await _client.SendAsync(httpRequest);
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -358,7 +387,7 @@ namespace LukeHagar.PlexAPI.SDK
             var contentType = httpResponse.Content.Headers.ContentType?.MediaType;
             int responseStatusCode = (int)httpResponse.StatusCode;
             if(responseStatusCode == 200)
-            {                
+            {
                 return new UpdatePlayProgressResponse()
                 {
                     StatusCode = responseStatusCode,
@@ -370,36 +399,54 @@ namespace LukeHagar.PlexAPI.SDK
             {
                 if(Utilities.IsContentTypeMatch("application/json", contentType))
                 {
-                    var obj = ResponseBodyDeserializer.Deserialize<UpdatePlayProgressBadRequest>(await httpResponse.Content.ReadAsStringAsync(), NullValueHandling.Ignore);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    UpdatePlayProgressBadRequestPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<UpdatePlayProgressBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into UpdatePlayProgressBadRequestPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    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);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    UpdatePlayProgressUnauthorizedPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<UpdatePlayProgressUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into UpdatePlayProgressUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    payload.RawResponse = httpResponse;
+                    throw new UpdatePlayProgressUnauthorized(payload, httpResponse, httpResponseBody);
                 }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
-            else if(responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
             {
-                throw new SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
-            else
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
             {
-                throw new SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                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)
@@ -408,21 +455,22 @@ namespace LukeHagar.PlexAPI.SDK
             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);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await _client.SendAsync(httpRequest);
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -464,45 +512,61 @@ namespace LukeHagar.PlexAPI.SDK
                     response.Bytes = await httpResponse.Content.ReadAsByteArrayAsync();
                     return response;
                 }
-                else
-                {
-                    throw new 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);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    GetBannerImageBadRequestPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetBannerImageBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetBannerImageBadRequestPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    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);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    GetBannerImageUnauthorizedPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetBannerImageUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetBannerImageUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    payload.RawResponse = httpResponse;
+                    throw new GetBannerImageUnauthorized(payload, httpResponse, httpResponseBody);
                 }
+
+                throw new Models.Errors.SDKException("Unknown content type received", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
-            else if(responseStatusCode >= 400 && responseStatusCode < 500 || responseStatusCode >= 500 && responseStatusCode < 600)
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
             {
-                throw new SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
-            else
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
             {
-                throw new SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                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)
@@ -511,21 +575,22 @@ namespace LukeHagar.PlexAPI.SDK
             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);
 
             HttpResponseMessage httpResponse;
             try
             {
-                httpResponse = await _client.SendAsync(httpRequest);
+                httpResponse = await SDKConfiguration.Client.SendAsync(httpRequest);
                 int _statusCode = (int)httpResponse.StatusCode;
 
                 if (_statusCode == 400 || _statusCode == 401 || _statusCode >= 400 && _statusCode < 500 || _statusCode >= 500 && _statusCode < 600)
@@ -567,45 +632,61 @@ namespace LukeHagar.PlexAPI.SDK
                     response.Bytes = await httpResponse.Content.ReadAsByteArrayAsync();
                     return response;
                 }
-                else
-                {
-                    throw new 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);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    GetThumbImageBadRequestPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetThumbImageBadRequestPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetThumbImageBadRequestPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    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);
-                    obj!.RawResponse = httpResponse;
-                    throw obj!;
-                }
-                else
-                {
-                    throw new SDKException("Unknown content type received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                    var httpResponseBody = await httpResponse.Content.ReadAsStringAsync();
+                    GetThumbImageUnauthorizedPayload payload;
+                    try
+                    {
+                        payload = ResponseBodyDeserializer.DeserializeNotNull<GetThumbImageUnauthorizedPayload>(httpResponseBody, NullValueHandling.Ignore);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new ResponseValidationException("Failed to deserialize response body into GetThumbImageUnauthorizedPayload.", httpResponse, httpResponseBody, ex);
+                    }
+
+                    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 || responseStatusCode >= 500 && responseStatusCode < 600)
+            else if(responseStatusCode >= 400 && responseStatusCode < 500)
             {
-                throw new SDKException("API error occurred", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                throw new Models.Errors.SDKException("API error occurred", httpResponse, await httpResponse.Content.ReadAsStringAsync());
             }
-            else
+            else if(responseStatusCode >= 500 && responseStatusCode < 600)
             {
-                throw new SDKException("Unknown status code received", responseStatusCode, await httpResponse.Content.ReadAsStringAsync(), httpResponse);
+                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/Components/Security.cs

@@ -14,7 +14,7 @@ namespace LukeHagar.PlexAPI.SDK.Models.Components
     public class Security
     {
 
-        [SpeakeasyMetadata("security:scheme=true,type=apiKey,subType=query,name=X-Plex-Token")]
+        [SpeakeasyMetadata("security:scheme=true,type=apiKey,subType=header,name=X-Plex-Token")]
         public string? AccessToken { get; set; }
     }
 }

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>
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class AddPlaylistContentsBadRequest : Exception
-    {
 
+    public class AddPlaylistContentsBadRequestPayload
+    {
         [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/AddPlaylistContentsErrors.cs

@@ -16,12 +16,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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

@@ -16,12 +16,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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>
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class AddPlaylistContentsUnauthorized : Exception
-    {
 
+    public class AddPlaylistContentsUnauthorizedPayload
+    {
         [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>
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class ApplyUpdatesBadRequest : Exception
-    {
 
+    public class ApplyUpdatesBadRequestPayload
+    {
         [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/ApplyUpdatesErrors.cs

@@ -16,12 +16,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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>
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class ApplyUpdatesUnauthorized : Exception
-    {
 
+    public class ApplyUpdatesUnauthorizedPayload
+    {
         [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/ApplyUpdatesUpdaterErrors.cs

@@ -16,12 +16,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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

@@ -16,12 +16,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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>
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class CancelServerActivitiesBadRequest : Exception
-    {
 
+    public class CancelServerActivitiesBadRequestPayload
+    {
         [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/CancelServerActivitiesErrors.cs

@@ -16,12 +16,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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>
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class CancelServerActivitiesUnauthorized : Exception
-    {
 
+    public class CancelServerActivitiesUnauthorizedPayload
+    {
         [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>
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class CheckForUpdatesBadRequest : Exception
-    {
 
+    public class CheckForUpdatesBadRequestPayload
+    {
         [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/CheckForUpdatesErrors.cs

@@ -16,12 +16,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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>
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class CheckForUpdatesUnauthorized : Exception
-    {
 
+    public class CheckForUpdatesUnauthorizedPayload
+    {
         [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/CheckForUpdatesUpdaterErrors.cs

@@ -16,12 +16,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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>
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class ClearPlaylistContentsBadRequest : Exception
-    {
 
+    public class ClearPlaylistContentsBadRequestPayload
+    {
         [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/ClearPlaylistContentsErrors.cs

@@ -16,12 +16,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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

@@ -16,12 +16,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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>
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class ClearPlaylistContentsUnauthorized : Exception
-    {
 
+    public class ClearPlaylistContentsUnauthorizedPayload
+    {
         [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>
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class CreatePlaylistBadRequest : Exception
-    {
 
+    public class CreatePlaylistBadRequestPayload
+    {
         [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/CreatePlaylistErrors.cs

@@ -16,12 +16,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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

@@ -16,12 +16,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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>
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class CreatePlaylistUnauthorized : Exception
-    {
 
+    public class CreatePlaylistUnauthorizedPayload
+    {
         [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>
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class DeleteLibraryBadRequest : Exception
-    {
 
+    public class DeleteLibraryBadRequestPayload
+    {
         [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/DeleteLibraryErrors.cs

@@ -16,12 +16,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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

@@ -16,12 +16,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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>
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class DeleteLibraryUnauthorized : Exception
-    {
 
+    public class DeleteLibraryUnauthorizedPayload
+    {
         [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>
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class DeletePlaylistBadRequest : Exception
-    {
 
+    public class DeletePlaylistBadRequestPayload
+    {
         [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/DeletePlaylistErrors.cs

@@ -16,12 +16,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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

@@ -16,12 +16,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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>
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class DeletePlaylistUnauthorized : Exception
-    {
 
+    public class DeletePlaylistUnauthorizedPayload
+    {
         [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>
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class EnablePaperTrailBadRequest : Exception
-    {
 
+    public class EnablePaperTrailBadRequestPayload
+    {
         [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/EnablePaperTrailErrors.cs

@@ -16,12 +16,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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

@@ -16,12 +16,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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>
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class EnablePaperTrailUnauthorized : Exception
-    {
 
+    public class EnablePaperTrailUnauthorizedPayload
+    {
         [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/Errors.cs

@@ -16,12 +16,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

LukeHagar/PlexAPI/SDK/Models/Errors/GetActorsLibraryBadRequest.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 GetActorsLibraryBadRequestPayload
+    {
+        [JsonProperty("errors")]
+        public List<GetActorsLibraryErrors>? 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 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,16 +12,16 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
     
-    public class GetRecentlyAddedErrors
+    public class GetActorsLibraryErrors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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

@@ -12,16 +12,16 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     using LukeHagar.PlexAPI.SDK.Utils;
     using Newtonsoft.Json;
     
-    public class GetMetaDataByRatingKeyErrors
+    public class GetActorsLibraryLibraryErrors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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>
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class GetAllLibrariesBadRequest : Exception
-    {
 
+    public class GetAllLibrariesBadRequestPayload
+    {
         [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/GetAllLibrariesErrors.cs

@@ -16,12 +16,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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

@@ -16,12 +16,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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>
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class GetAllLibrariesUnauthorized : Exception
-    {
 
+    public class GetAllLibrariesUnauthorizedPayload
+    {
         [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>
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class GetAvailableClientsBadRequest : Exception
-    {
 
+    public class GetAvailableClientsBadRequestPayload
+    {
         [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/GetAvailableClientsErrors.cs

@@ -16,12 +16,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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

@@ -16,12 +16,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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>
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class GetAvailableClientsUnauthorized : Exception
-    {
 
+    public class GetAvailableClientsUnauthorizedPayload
+    {
         [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>
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class GetBandwidthStatisticsBadRequest : Exception
-    {
 
+    public class GetBandwidthStatisticsBadRequestPayload
+    {
         [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/GetBandwidthStatisticsErrors.cs

@@ -16,12 +16,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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

@@ -16,12 +16,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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>
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class GetBandwidthStatisticsUnauthorized : Exception
-    {
 
+    public class GetBandwidthStatisticsUnauthorizedPayload
+    {
         [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>
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class GetBannerImageBadRequest : Exception
-    {
 
+    public class GetBannerImageBadRequestPayload
+    {
         [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/GetBannerImageErrors.cs

@@ -16,12 +16,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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

@@ -16,12 +16,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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>
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class GetBannerImageUnauthorized : Exception
-    {
 
+    public class GetBannerImageUnauthorizedPayload
+    {
         [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>
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class GetButlerTasksBadRequest : Exception
-    {
 
+    public class GetButlerTasksBadRequestPayload
+    {
         [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/GetButlerTasksButlerErrors.cs

@@ -16,12 +16,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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

@@ -16,12 +16,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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>
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class GetButlerTasksUnauthorized : Exception
-    {
 
+    public class GetButlerTasksUnauthorizedPayload
+    {
         [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>
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class GetCompanionsDataBadRequest : Exception
-    {
 
+    public class GetCompanionsDataBadRequestPayload
+    {
         [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/GetCompanionsDataErrors.cs

@@ -16,12 +16,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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

@@ -16,12 +16,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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>
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class GetCompanionsDataUnauthorized : Exception
-    {
 
+    public class GetCompanionsDataUnauthorizedPayload
+    {
         [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

@@ -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 GetCountriesLibraryErrors
+    {
+
+        [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/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>
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class GetDevicesBadRequest : Exception
-    {
 
+    public class GetDevicesBadRequestPayload
+    {
         [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/GetDevicesErrors.cs

@@ -16,12 +16,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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

@@ -16,12 +16,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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>
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class GetDevicesUnauthorized : Exception
-    {
 
+    public class GetDevicesUnauthorizedPayload
+    {
         [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>
-    /// Bad Request - A parameter was not specified, or was specified incorrectly.
-    /// </summary>
-    public class GetFileHashBadRequest : Exception
-    {
 
+    public class GetFileHashBadRequestPayload
+    {
         [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/GetFileHashErrors.cs

@@ -16,12 +16,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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

@@ -16,12 +16,12 @@ namespace LukeHagar.PlexAPI.SDK.Models.Errors
     {
 
         [JsonProperty("code")]
-        public long? Code { get; set; }
+        public int? Code { get; set; }
 
         [JsonProperty("message")]
         public string? Message { get; set; }
 
         [JsonProperty("status")]
-        public long? Status { get; set; }
+        public int? Status { get; set; }
     }
 }

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>
-    /// Unauthorized - Returned if the X-Plex-Token is missing from the header or query.
-    /// </summary>
-    public class GetFileHashUnauthorized : Exception
-    {
 
+    public class GetFileHashUnauthorizedPayload
+    {
         [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
+        }
+    }
+
+}