docs: work on README

tests/AnthropicClient.Tests/.runsettings

@@ -0,0 +1,11 @@
+<RunSettings>
+  <LoggerRunSettings>
+    <Loggers>
+      <Logger friendlyName="console" enabled="True">
+        <Configuration>
+          <Verbosity>quiet</Verbosity>
+        </Configuration>
+      </Logger>
+    </Loggers>
+  </LoggerRunSettings>
+</RunSettings>

tests/AnthropicClient.Tests/Data/ErrorTestData.cs

@@ -1,4 +1,4 @@
-namespace AnthropicClient.Tests.Integration;
+namespace AnthropicClient.Tests.Data;
 
 public class ErrorTestData : IEnumerable<object[]>
 {

tests/AnthropicClient.Tests/Data/EventTestData.cs

@@ -1,4 +1,4 @@
-namespace AnthropicClient.Tests.Integration;
+namespace AnthropicClient.Tests.Data;
 
 public class EventTestData : IEnumerable<object[]>
 {
@@ -21,7 +21,7 @@ public class EventTestData : IEnumerable<object[]>
         Role = MessageRole.Assistant,
         Model = AnthropicModels.Claude3Haiku,
         StopSequence = null,
-        Usage = new ChatUsage { InputTokens = 472, OutputTokens = 91 },
+        Usage = new Usage { InputTokens = 472, OutputTokens = 91 },
         StopReason = "tool_use",
         Content = [
           new TextContent("Okay, let's check the weather for San Francisco, CA:"),
@@ -54,14 +54,14 @@ public class EventTestData : IEnumerable<object[]>
         Type = EventType.MessageStart,
         Data = new MessageStartEventData()
         {
-          Message = new ChatResponse()
+          Message = new MessageResponse()
           {
             Id = "msg_014p7gG3wDgGV9EUtLvnow3U",
             Type = "message",
             Role = "assistant",
             Model = "claude-3-haiku-20240307",
             StopSequence = null,
-            Usage = new ChatUsage()
+            Usage = new Usage()
             {
               InputTokens = 472,
               OutputTokens = 2,
@@ -640,7 +640,7 @@ public class EventTestData : IEnumerable<object[]>
             StopReason = "tool_use",
             StopSequence = null,
           },
-          Usage = new ChatUsage()
+          Usage = new Usage()
           {
             OutputTokens = 89,
           },

tests/AnthropicClient.Tests/Data/JsonSchemaGeneratorTestData.cs

@@ -1,6 +1,4 @@
-using System.Text.Json.Nodes;
-
-namespace AnthropicClient.Tests.Unit.Utils;
+namespace AnthropicClient.Tests.Data;
 
 public class JsonSchemaGeneratorTestData : IEnumerable<object[]>
 {
@@ -340,7 +338,7 @@ public class JsonSchemaGeneratorTestData : IEnumerable<object[]>
       }
     };
 
-    // datetime parameter type
+    // date time parameter type
     yield return new object[]
     {
       Tool.CreateFromFunction(TestToolName,TestToolDescription,(DateTime date) => date),
@@ -363,7 +361,7 @@ public class JsonSchemaGeneratorTestData : IEnumerable<object[]>
       }
     };
 
-    // datetimeoffset parameter type
+    // date time offset parameter type
     yield return new object[]
     {
       Tool.CreateFromFunction(TestToolName,TestToolDescription,(DateTimeOffset date) => date),

tests/AnthropicClient.Tests/EndToEnd/AnthropicApiClientTests.cs

@@ -3,29 +3,29 @@ namespace AnthropicClient.Tests.EndToEnd;
 public class ClientTests(ConfigurationFixture configFixture) : EndToEndTest(configFixture)
 {
   [Fact]
-  public async Task CreateChatMessage_WhenCalled_ItShouldReturnChatResponse()
+  public async Task CreateMessageAsync_WhenCalled_ItShouldReturnResponse()
   {
-    var request = new ChatMessageRequest(
+    var request = new MessageRequest(
       model: AnthropicModels.Claude3Haiku,
       messages: [new(MessageRole.User, [new TextContent("Hello!")])]
     );
 
-    var result = await _client.CreateChatMessageAsync(request);
+    var result = await _client.CreateMessageAsync(request);
 
     result.IsSuccess.Should().BeTrue();
-    result.Value.Should().BeOfType<ChatResponse>();
+    result.Value.Should().BeOfType<MessageResponse>();
     result.Value.Content.Should().NotBeNullOrEmpty();
   }
 
   [Fact]
-  public async Task CreateChatMessage_WhenCalledWithStreamRequest_ItShouldReturnEvents()
+  public async Task CreateMessageAsync_WhenCalledWithStreamRequest_ItShouldReturnEvents()
   {
-    var request = new StreamChatMessageRequest(
+    var request = new StreamMessageRequest(
       model: AnthropicModels.Claude3Haiku,
       messages: [new(MessageRole.User, [new TextContent("Hello!")])]
     );
 
-    var response = _client.CreateChatMessageAsync(request);
+    var response = _client.CreateMessageAsync(request);
 
     var events = new List<AnthropicEvent>();
 
@@ -38,14 +38,14 @@ public class ClientTests(ConfigurationFixture configFixture) : EndToEndTest(conf
   }
 
   [Fact]
-  public async Task CreateChatMessage_WhenCalledWithStreamRequest_ItShouldYieldAMessageCompleteEvent()
+  public async Task CreateMessageAsync_WhenCalledWithStreamRequest_ItShouldYieldAMessageCompleteEvent()
   {
-    var request = new StreamChatMessageRequest(
+    var request = new StreamMessageRequest(
       model: AnthropicModels.Claude3Haiku,
       messages: [new(MessageRole.User, [new TextContent("Hello!")])]
     );
 
-    var response = _client.CreateChatMessageAsync(request);
+    var response = _client.CreateMessageAsync(request);
 
     await foreach (var e in response)
     {

tests/AnthropicClient.Tests/EndToEnd/HttpClientFixture.cs

@@ -1,11 +0,0 @@
-namespace AnthropicClient.Tests.EndToEnd;
-
-public class HttpClientFixture
-{
-  public HttpClient HttpClient { get; }
-
-  public HttpClientFixture()
-  {
-    HttpClient = new HttpClient();
-  }
-}

tests/AnthropicClient.Tests/Examples/ExampleAttribute.cs

@@ -0,0 +1,14 @@
+namespace AnthropicClient.Tests.Examples;
+
+public class ExampleAttribute : FactAttribute
+{
+  public ExampleAttribute()
+  {
+    var skipExamples = Environment.GetEnvironmentVariable("SKIP_EXAMPLES");
+
+    if (skipExamples == "true")
+    {
+      Skip = "Example";
+    }
+  }
+}

tests/AnthropicClient.Tests/Examples/Examples.cs

@@ -0,0 +1,108 @@
+#pragma warning disable xUnit1004
+
+using Xunit.Abstractions;
+
+namespace AnthropicClient.Tests.Examples;
+
+public class Examples(ConfigurationFixture config, ITestOutputHelper console) : IClassFixture<ConfigurationFixture>
+{
+  private readonly ITestOutputHelper _console = console;
+  private readonly AnthropicApiClient _client = new(config.AnthropicApiKey, new());
+
+  [Example]
+  public async Task CreateMessage()
+  {
+    var response = await _client.CreateMessageAsync(new MessageRequest(
+      AnthropicModels.Claude3Haiku,
+      [
+        new(
+          MessageRole.User, 
+          [new TextContent("Please write a haiku about the ocean.")]
+        )
+      ]
+    ));
+
+    if (response.IsSuccess is false)
+    {
+      _console.WriteLine($"Failed to create message");
+      _console.WriteLine($"Error Type: {0}", response.Error.Error.Type);
+      _console.WriteLine($"Error Message: {0}", response.Error.Error.Message);
+    }
+
+    foreach (var content in response.Value.Content)
+    {
+      switch (content)
+      {
+        case TextContent textContent:
+          _console.WriteLine(textContent.Text);
+          break;
+      }
+    }
+  }
+  
+  [Example]
+  public async Task CreateAndStreamMessage()
+  {
+    var events = _client.CreateMessageAsync(new StreamMessageRequest(
+      AnthropicModels.Claude3Haiku,
+      [
+        new(
+          MessageRole.User, 
+          [new TextContent("Please write a haiku about the ocean.")]
+        )
+      ]
+    ));
+
+    var msgBuilder = new StringBuilder();
+
+    await foreach (var e in events)
+    {
+      switch (e.Data)
+      {
+        case var data when data is ContentDeltaEventData contentData:
+          switch (contentData.Delta)
+          {
+            case var delta when delta is TextDelta textDelta:
+              msgBuilder.Append(textDelta.Text);
+              break;
+          }
+          break;
+      }
+    }
+
+    _console.WriteLine(msgBuilder.ToString());
+  }
+
+  [Example]
+  public async Task CreateStreamMessageAndGetCompleteMessageResponse()
+  {
+    var events = _client.CreateMessageAsync(new StreamMessageRequest(
+      AnthropicModels.Claude3Haiku,
+      [
+        new(
+          MessageRole.User, 
+          [new TextContent("Please write a haiku about the ocean.")]
+        )
+      ]
+    ));
+
+    MessageResponse? response = null;
+
+    await foreach (var e in events)
+    {
+      switch (e.Data)
+      {
+        case var data when data is MessageCompleteEventData msgData:
+          response = msgData.Message;
+          break;
+      }
+    }
+
+    var textContent = response?.Content
+      .OfType<TextContent>()
+      .Aggregate(new StringBuilder(), (sb, c) => sb.Append(c.Text))
+      .ToString();
+
+    _console.WriteLine(textContent);
+  }
+}

tests/AnthropicClient.Tests/Fixtures/ConfigurationFixture.cs

@@ -1,4 +1,4 @@
-namespace AnthropicClient.Tests.EndToEnd;
+namespace AnthropicClient.Tests.Fixtures;
 
 public class ConfigurationFixture
 {

tests/AnthropicClient.Tests/Integration/AnthropicApiClientTests.cs

@@ -4,7 +4,7 @@ public class AnthropicApiClientTests : IntegrationTest
 {
   [Theory]
   [ClassData(typeof(ErrorTestData))]
-  public async Task CreateChatMessageAsync_WhenCalledAndErrorReturned_ItShouldHandleError(
+  public async Task CreateMessageAsync_WhenCalledAndErrorReturned_ItShouldHandleError(
     HttpStatusCode statusCode,
     string content,
     Type errorType
@@ -18,12 +18,12 @@ public class AnthropicApiClientTests : IntegrationTest
         content
       );
 
-    var request = new ChatMessageRequest(
+    var request = new MessageRequest(
       model: AnthropicModels.Claude3Haiku,
       messages: [new(MessageRole.User, [new TextContent("Hello!")])]
     );
 
-    var result = await Client.CreateChatMessageAsync(request);
+    var result = await Client.CreateMessageAsync(request);
 
     result.IsSuccess.Should().BeFalse();
     result.Error.Should().BeOfType<AnthropicError>();
@@ -33,7 +33,7 @@ public class AnthropicApiClientTests : IntegrationTest
   }
 
   [Fact]
-  public async Task CreateChatMessageAsync_WhenCalledAndMessageCreatedWithTextContent_ItShouldReturnMessage()
+  public async Task CreateMessageAsync_WhenCalledAndMessageCreatedWithTextContent_ItShouldReturnMessage()
   {
     _mockHttpMessageHandler
       .WhenCreateMessageRequest()
@@ -60,15 +60,15 @@ public class AnthropicApiClientTests : IntegrationTest
         }"
       );
 
-    var request = new ChatMessageRequest(
+    var request = new MessageRequest(
       model: AnthropicModels.Claude35Sonnet,
       messages: [new(MessageRole.User, [new TextContent("Hello!")])]
     );
 
-    var result = await Client.CreateChatMessageAsync(request);
+    var result = await Client.CreateMessageAsync(request);
 
     result.IsSuccess.Should().BeTrue();
-    result.Value.Should().BeOfType<ChatResponse>();
+    result.Value.Should().BeOfType<MessageResponse>();
     result.Error.Should().BeNull();
 
     var message = result.Value;
@@ -90,7 +90,7 @@ public class AnthropicApiClientTests : IntegrationTest
   }
 
   [Fact]
-  public async Task CreateChatMessageAsync_WhenCalledAndMessageCreatedWithToolUseContentAndToolIsProvided_ItShouldReturnMessageWithToolCall()
+  public async Task CreateMessageAsync_WhenCalledAndMessageCreatedWithToolUseContentAndToolIsProvided_ItShouldReturnMessageWithToolCall()
   {
     _mockHttpMessageHandler
       .WhenCreateMessageRequest()
@@ -121,7 +121,7 @@ public class AnthropicApiClientTests : IntegrationTest
 
     var func = (string ticker) => ticker;
 
-    var request = new ChatMessageRequest(
+    var request = new MessageRequest(
       model: AnthropicModels.Claude35Sonnet,
       messages: [
         new(MessageRole.User, [new TextContent("Hello!")]),
@@ -131,10 +131,10 @@ public class AnthropicApiClientTests : IntegrationTest
       ]
     );
 
-    var result = await Client.CreateChatMessageAsync(request);
+    var result = await Client.CreateMessageAsync(request);
 
     result.IsSuccess.Should().BeTrue();
-    result.Value.Should().BeOfType<ChatResponse>();
+    result.Value.Should().BeOfType<MessageResponse>();
     result.Error.Should().BeNull();
 
     var message = result.Value;
@@ -168,7 +168,7 @@ public class AnthropicApiClientTests : IntegrationTest
 
 
   [Fact]
-  public async Task CreateChatMessageAsync_WhenCalledAndMessageCreatedWithToolUseButNoToolProvided_ItShouldReturnMessageWithoutToolCall()
+  public async Task CreateMessageAsync_WhenCalledAndMessageCreatedWithToolUseButNoToolProvided_ItShouldReturnMessageWithoutToolCall()
   {
     _mockHttpMessageHandler
       .WhenCreateMessageRequest()
@@ -197,17 +197,17 @@ public class AnthropicApiClientTests : IntegrationTest
         }"
       );
 
-    var request = new ChatMessageRequest(
+    var request = new MessageRequest(
       model: AnthropicModels.Claude35Sonnet,
       messages: [
         new(MessageRole.User, [new TextContent("Hello!")]),
       ]
     );
 
-    var result = await Client.CreateChatMessageAsync(request);
+    var result = await Client.CreateMessageAsync(request);
 
     result.IsSuccess.Should().BeTrue();
-    result.Value.Should().BeOfType<ChatResponse>();
+    result.Value.Should().BeOfType<MessageResponse>();
     result.Error.Should().BeNull();
 
     var message = result.Value;
@@ -236,7 +236,7 @@ public class AnthropicApiClientTests : IntegrationTest
 
   [Theory]
   [ClassData(typeof(EventTestData))]
-  public async Task CreateChatMessageAsync_WhenCalledAndMessageIsStreamed_ItShouldHandleAllEventTypes(string eventString, AnthropicEvent anthropicEvent)
+  public async Task CreateMessageAsync_WhenCalledAndMessageIsStreamed_ItShouldHandleAllEventTypes(string eventString, AnthropicEvent anthropicEvent)
   {
     _mockHttpMessageHandler
       .WhenCreateStreamMessageRequest()
@@ -246,21 +246,21 @@ public class AnthropicApiClientTests : IntegrationTest
         new MemoryStream(Encoding.UTF8.GetBytes(eventString))
       );
 
-    var request = new StreamChatMessageRequest(
+    var request = new StreamMessageRequest(
       model: AnthropicModels.Claude35Sonnet,
       messages: [
         new(MessageRole.User, [new TextContent("Hello!")]),
       ]
     );
 
-    var result = Client.CreateChatMessageAsync(request);
+    var result = Client.CreateMessageAsync(request);
     var e = await result.FirstOrDefaultAsync();
 
     e.Should().BeEquivalentTo(anthropicEvent);
   }
 
   [Fact]
-  public async Task CreateChatMessageAsync_WhenCalledAndMessageIsStreamed_ItShouldReturnAllExpectedEvents()
+  public async Task CreateMessageAsync_WhenCalledAndMessageIsStreamed_ItShouldReturnAllExpectedEvents()
   {
     var eventStream = EventTestData.GetEventStream();
     var events = EventTestData.GetAllEvents();
@@ -273,14 +273,14 @@ public class AnthropicApiClientTests : IntegrationTest
         eventStream
       );
 
-    var request = new StreamChatMessageRequest(
+    var request = new StreamMessageRequest(
       model: AnthropicModels.Claude35Sonnet,
       messages: [
         new(MessageRole.User, [new TextContent("Hello!")]),
       ]
     );
 
-    var result = Client.CreateChatMessageAsync(request);
+    var result = Client.CreateMessageAsync(request);
 
     var actualEvents = await result.ToListAsync();
 
@@ -288,7 +288,7 @@ public class AnthropicApiClientTests : IntegrationTest
   }
 
   [Fact]
-  public async Task CreateChatMessageAsync_WhenCalledMessageIsStreamedAndToolProvide_ItShouldReturnToolCall()
+  public async Task CreateMessageAsync_WhenCalledMessageIsStreamedAndToolProvide_ItShouldReturnToolCall()
   {
     var eventStream = EventTestData.GetEventStream();
 
@@ -302,7 +302,7 @@ public class AnthropicApiClientTests : IntegrationTest
 
     var getWeather = (string location, string unit) => $"The weather in {location} is 72°{unit}";
 
-    var request = new StreamChatMessageRequest(
+    var request = new StreamMessageRequest(
       model: AnthropicModels.Claude35Sonnet,
       messages: [
         new(MessageRole.User, [new TextContent("Hello!")]),
@@ -312,7 +312,7 @@ public class AnthropicApiClientTests : IntegrationTest
       ]
     );
 
-    var result = Client.CreateChatMessageAsync(request);
+    var result = Client.CreateMessageAsync(request);
     var msgCompleteEvent = await result
       .Where(e => e.Type is EventType.MessageComplete)
       .FirstAsync();

tests/AnthropicClient.Tests/Integration/IntegrationTest.cs

@@ -28,13 +28,13 @@ public static class MockHttpMessageHandlerExtensions
   {
     return mockHttpMessageHandler
       .SetupBaseRequest()
-      .WithJsonContent<ChatMessageRequest>(r => r.Stream == false, JsonSerializationOptions.DefaultOptions);
+      .WithJsonContent<MessageRequest>(r => r.Stream == false, JsonSerializationOptions.DefaultOptions);
   }
 
   public static MockedRequest WhenCreateStreamMessageRequest(this MockHttpMessageHandler mockHttpMessageHandler)
   {
     return mockHttpMessageHandler
       .SetupBaseRequest()
-      .WithJsonContent<StreamChatMessageRequest>(r => r.Stream == true, JsonSerializationOptions.DefaultOptions);
+      .WithJsonContent<StreamMessageRequest>(r => r.Stream == true, JsonSerializationOptions.DefaultOptions);
   }
 }

tests/AnthropicClient.Tests/Unit/Models/MessageCompleteEventDataTests.cs

@@ -5,7 +5,7 @@ public class MessageCompleteEventDataTests
   [Fact]
   public void Constructor_WhenCalled_ItShouldInitializeProperties()
   {
-    var expectedMessage = new ChatResponse();
+    var expectedMessage = new MessageResponse();
     var expectedHeaders = new AnthropicHeaders();
 
     var messageCompleteEventData = new MessageCompleteEventData(expectedMessage, expectedHeaders);

tests/AnthropicClient.Tests/Unit/Models/MessageDeltaEventDataTests.cs

@@ -18,7 +18,7 @@ public class MessageDeltaEventDataTests : SerializationTest
   public void Constructor_WhenCalled_ItShouldInitializeProperties()
   {
     var expectedDelta = new MessageDelta("max_tokens", "max_tokens");
-    var expectedUsage = new ChatUsage { InputTokens = 1, OutputTokens = 1 };
+    var expectedUsage = new Usage { InputTokens = 1, OutputTokens = 1 };
 
     var messageDeltaEventData = new MessageDeltaEventData(expectedDelta, expectedUsage);
 
@@ -30,7 +30,7 @@ public class MessageDeltaEventDataTests : SerializationTest
   public void JsonSerialization_WhenSerialized_ItShouldHaveExpectedShape()
   {
     var expectedDelta = new MessageDelta("max_tokens", "max_tokens");
-    var expectedUsage = new ChatUsage { InputTokens = 1, OutputTokens = 1 };
+    var expectedUsage = new Usage { InputTokens = 1, OutputTokens = 1 };
 
     var messageDeltaEventData = new MessageDeltaEventData(expectedDelta, expectedUsage);
 
@@ -43,7 +43,7 @@ public class MessageDeltaEventDataTests : SerializationTest
   public void JsonDeserialization_WhenDeserialized_ItShouldHaveExpectedValues()
   {
     var expectedDelta = new MessageDelta("max_tokens", "max_tokens");
-    var expectedUsage = new ChatUsage { InputTokens = 1, OutputTokens = 1 };
+    var expectedUsage = new Usage { InputTokens = 1, OutputTokens = 1 };
 
     var messageDeltaEventData = Deserialize<MessageDeltaEventData>(_testJson);
 

tests/AnthropicClient.Tests/Unit/Models/MessageRequestTests.cs

@@ -1,6 +1,6 @@
 namespace AnthropicClient.Tests.Unit.Models;
 
-public class ChatMessageRequestTests : SerializationTest
+public class MessageRequestTests : SerializationTest
 {
   private readonly string _testJson = @"{
     ""model"": ""claude-3-sonnet-20240229"",
@@ -152,7 +152,7 @@ public class ChatMessageRequestTests : SerializationTest
   public void Constructor_WhenCalled_ItShouldInitializeProperties()
   {
     var model = AnthropicModels.Claude3Sonnet;
-    var messages = new List<ChatMessage> { new() };
+    var messages = new List<Message> { new() };
     var maxTokens = 512;
     var system = "test-system";
     var metadata = new Dictionary<string, object> { ["test"] = "test" };
@@ -162,7 +162,7 @@ public class ChatMessageRequestTests : SerializationTest
     var toolChoice = new AutoToolChoice();
     var tools = new List<Tool>();
 
-    var chatMessageRequest = new ChatMessageRequest(
+    var messageRequest = new MessageRequest(
       model: model,
       messages: messages,
       maxTokens: maxTokens,
@@ -175,23 +175,23 @@ public class ChatMessageRequestTests : SerializationTest
       tools: tools
     );
 
-    chatMessageRequest.Model.Should().Be(model);
-    chatMessageRequest.Messages.Should().BeSameAs(messages);
-    chatMessageRequest.MaxTokens.Should().Be(maxTokens);
-    chatMessageRequest.System.Should().Be(system);
-    chatMessageRequest.Metadata.Should().BeSameAs(metadata);
-    chatMessageRequest.Temperature.Should().Be(temperature);
-    chatMessageRequest.TopK.Should().Be(topK);
-    chatMessageRequest.TopP.Should().Be(topP);
-    chatMessageRequest.ToolChoice.Should().Be(toolChoice);
-    chatMessageRequest.Tools.Should().BeSameAs(tools);
-    chatMessageRequest.Stream.Should().BeFalse();
+    messageRequest.Model.Should().Be(model);
+    messageRequest.Messages.Should().BeSameAs(messages);
+    messageRequest.MaxTokens.Should().Be(maxTokens);
+    messageRequest.System.Should().Be(system);
+    messageRequest.Metadata.Should().BeSameAs(metadata);
+    messageRequest.Temperature.Should().Be(temperature);
+    messageRequest.TopK.Should().Be(topK);
+    messageRequest.TopP.Should().Be(topP);
+    messageRequest.ToolChoice.Should().Be(toolChoice);
+    messageRequest.Tools.Should().BeSameAs(tools);
+    messageRequest.Stream.Should().BeFalse();
   }
 
   [Fact]
   public void Constructor_WhenCalledAndModelIsNull_ItShouldThrowArgumentNullException()
   {
-    var action = () => new ChatMessageRequest(
+    var action = () => new MessageRequest(
       model: null!,
       messages: [new()]
     );
@@ -202,7 +202,7 @@ public class ChatMessageRequestTests : SerializationTest
   [Fact]
   public void Constructor_WhenCalledAndMessagesIsNull_ItShouldThrowArgumentNullException()
   {
-    var action = () => new ChatMessageRequest(
+    var action = () => new MessageRequest(
       model: AnthropicModels.Claude3Sonnet,
       messages: null!
     );
@@ -213,7 +213,7 @@ public class ChatMessageRequestTests : SerializationTest
   [Fact]
   public void Constructor_WhenCalledAndModelIsInvalid_ItShouldThrowArgumentException()
   {
-    var action = () => new ChatMessageRequest(
+    var action = () => new MessageRequest(
       model: "invalid-model",
       messages: [new()]
     );
@@ -224,7 +224,7 @@ public class ChatMessageRequestTests : SerializationTest
   [Fact]
   public void Constructor_WhenCalledAndMessagesIsEmpty_ItShouldThrowArgumentException()
   {
-    var action = () => new ChatMessageRequest(
+    var action = () => new MessageRequest(
       model: AnthropicModels.Claude3Sonnet,
       messages: []
     );
@@ -235,7 +235,7 @@ public class ChatMessageRequestTests : SerializationTest
   [Fact]
   public void Constructor_WhenCalledAndMaxTokensIsInvalid_ItShouldThrowArgumentException()
   {
-    var action = () => new ChatMessageRequest(
+    var action = () => new MessageRequest(
       model: AnthropicModels.Claude3Sonnet,
       messages: [new()],
       maxTokens: 0
@@ -249,7 +249,7 @@ public class ChatMessageRequestTests : SerializationTest
   [InlineData(2)]
   public void Constructor_WhenCalledAndTemperatureIsInvalid_ItShouldThrowArgumentException(decimal temperature)
   {
-    var action = () => new ChatMessageRequest(
+    var action = () => new MessageRequest(
       model: AnthropicModels.Claude3Sonnet,
       messages: [new()],
       temperature: temperature
@@ -261,7 +261,7 @@ public class ChatMessageRequestTests : SerializationTest
   [Fact]
   public void JsonSerialization_WhenSerialized_ItShouldHaveExpectedShape()
   {
-    var messages = new List<ChatMessage>()
+    var messages = new List<Message>()
     {
       new()
       {
@@ -283,7 +283,7 @@ public class ChatMessageRequestTests : SerializationTest
     var toolChoice = new AutoToolChoice();
     var tools = new List<Tool>();
 
-    var chatMessageRequest = new ChatMessageRequest(
+    var messageRequest = new MessageRequest(
       model: model,
       messages: messages,
       maxTokens: maxTokens,
@@ -296,7 +296,7 @@ public class ChatMessageRequestTests : SerializationTest
       tools: tools
     );
 
-    var actual = Serialize(chatMessageRequest);
+    var actual = Serialize(messageRequest);
 
     JsonAssert.Equal(_testJson, actual);
   }
@@ -304,71 +304,71 @@ public class ChatMessageRequestTests : SerializationTest
   [Fact]
   public void JsonDeserialization_WhenDeserialized_ItShouldHaveExpectedShape()
   {
-    var chatMessageRequest = Deserialize<ChatMessageRequest>(_testJson);
+    var messageRequest = Deserialize<MessageRequest>(_testJson);
 
-    chatMessageRequest!.Model.Should().Be(AnthropicModels.Claude3Sonnet);
-    chatMessageRequest.System.Should().Be("test-system");
-    chatMessageRequest.Messages.Should().HaveCount(1);
-    chatMessageRequest.MaxTokens.Should().Be(512);
-    chatMessageRequest.Metadata.Should().HaveCount(1);
+    messageRequest!.Model.Should().Be(AnthropicModels.Claude3Sonnet);
+    messageRequest.System.Should().Be("test-system");
+    messageRequest.Messages.Should().HaveCount(1);
+    messageRequest.MaxTokens.Should().Be(512);
+    messageRequest.Metadata.Should().HaveCount(1);
 
-    var testValue = chatMessageRequest.Metadata!.GetValueOrDefault("test")!.ToString();
+    var testValue = messageRequest.Metadata!.GetValueOrDefault("test")!.ToString();
     testValue.Should().Be("test");
 
-    chatMessageRequest.Temperature.Should().Be(0.5m);
-    chatMessageRequest.TopK.Should().Be(10);
-    chatMessageRequest.TopP.Should().Be(0.5m);
-    chatMessageRequest.ToolChoice.Should().BeOfType<AutoToolChoice>();
-    chatMessageRequest.ToolChoice!.Type.Should().Be("auto");
-    chatMessageRequest.Tools.Should().HaveCount(0);
-    chatMessageRequest.Stream.Should().BeFalse();
+    messageRequest.Temperature.Should().Be(0.5m);
+    messageRequest.TopK.Should().Be(10);
+    messageRequest.TopP.Should().Be(0.5m);
+    messageRequest.ToolChoice.Should().BeOfType<AutoToolChoice>();
+    messageRequest.ToolChoice!.Type.Should().Be("auto");
+    messageRequest.Tools.Should().HaveCount(0);
+    messageRequest.Stream.Should().BeFalse();
   }
 
   [Fact]
   public void JsonDeserialization_WhenDeserializedWithAnyToolChoice_ItShouldHaveExpectedShape()
   {
-    var chatMessageRequest = Deserialize<ChatMessageRequest>(_testJsonWithAnyToolChoice);
+    var messageRequest = Deserialize<MessageRequest>(_testJsonWithAnyToolChoice);
 
-    chatMessageRequest!.Model.Should().Be(AnthropicModels.Claude3Sonnet);
-    chatMessageRequest.System.Should().Be("test-system");
-    chatMessageRequest.Messages.Should().HaveCount(1);
-    chatMessageRequest.MaxTokens.Should().Be(512);
-    chatMessageRequest.Metadata.Should().HaveCount(1);
+    messageRequest!.Model.Should().Be(AnthropicModels.Claude3Sonnet);
+    messageRequest.System.Should().Be("test-system");
+    messageRequest.Messages.Should().HaveCount(1);
+    messageRequest.MaxTokens.Should().Be(512);
+    messageRequest.Metadata.Should().HaveCount(1);
 
-    var testValue = chatMessageRequest.Metadata!.GetValueOrDefault("test")!.ToString();
+    var testValue = messageRequest.Metadata!.GetValueOrDefault("test")!.ToString();
     testValue.Should().Be("test");
 
-    chatMessageRequest.Temperature.Should().Be(0.5m);
-    chatMessageRequest.TopK.Should().Be(10);
-    chatMessageRequest.TopP.Should().Be(0.5m);
-    chatMessageRequest.ToolChoice.Should().BeOfType<AnyToolChoice>();
-    chatMessageRequest.ToolChoice!.Type.Should().Be("any");
-    chatMessageRequest.Tools.Should().HaveCount(0);
+    messageRequest.Temperature.Should().Be(0.5m);
+    messageRequest.TopK.Should().Be(10);
+    messageRequest.TopP.Should().Be(0.5m);
+    messageRequest.ToolChoice.Should().BeOfType<AnyToolChoice>();
+    messageRequest.ToolChoice!.Type.Should().Be("any");
+    messageRequest.Tools.Should().HaveCount(0);
   }
 
   [Fact]
   public void JsonDeserialization_WhenDeserializedWithSpecificToolChoice_ItShouldHaveExpectedShape()
   {
-    var chatMessageRequest = Deserialize<ChatMessageRequest>(_testJsonWithSpecificToolChoice);
+    var messageRequest = Deserialize<MessageRequest>(_testJsonWithSpecificToolChoice);
 
-    chatMessageRequest!.Model.Should().Be(AnthropicModels.Claude3Sonnet);
-    chatMessageRequest.System.Should().Be("test-system");
-    chatMessageRequest.Messages.Should().HaveCount(1);
-    chatMessageRequest.MaxTokens.Should().Be(512);
-    chatMessageRequest.Metadata.Should().HaveCount(1);
+    messageRequest!.Model.Should().Be(AnthropicModels.Claude3Sonnet);
+    messageRequest.System.Should().Be("test-system");
+    messageRequest.Messages.Should().HaveCount(1);
+    messageRequest.MaxTokens.Should().Be(512);
+    messageRequest.Metadata.Should().HaveCount(1);
 
-    var testValue = chatMessageRequest.Metadata!.GetValueOrDefault("test")!.ToString();
+    var testValue = messageRequest.Metadata!.GetValueOrDefault("test")!.ToString();
     testValue.Should().Be("test");
 
-    chatMessageRequest.Temperature.Should().Be(0.5m);
-    chatMessageRequest.TopK.Should().Be(10);
-    chatMessageRequest.TopP.Should().Be(0.5m);
-    chatMessageRequest.ToolChoice.Should().BeOfType<SpecificToolChoice>();
+    messageRequest.Temperature.Should().Be(0.5m);
+    messageRequest.TopK.Should().Be(10);
+    messageRequest.TopP.Should().Be(0.5m);
+    messageRequest.ToolChoice.Should().BeOfType<SpecificToolChoice>();
 
-    var specificToolChoice = chatMessageRequest.ToolChoice as SpecificToolChoice;
+    var specificToolChoice = messageRequest.ToolChoice as SpecificToolChoice;
     specificToolChoice!.Type.Should().Be("tool");
     specificToolChoice.Name.Should().Be("test-tool");
-    chatMessageRequest.Tools.Should().HaveCount(0);
+    messageRequest.Tools.Should().HaveCount(0);
   }
 
   [Fact]
@@ -376,7 +376,7 @@ public class ChatMessageRequestTests : SerializationTest
   {
     var json = @"{""model"":""claude-3-sonnet-20240229"",""system"":""test-system"",""messages"":[{""role"":""user"",""content"":[{""text"":""Hello!"",""type"":""text""}]}],""max_tokens"":512,""metadata"":{""test"":""test""},""stop_sequences"":[],""temperature"":0.5,""topK"":10,""topP"":0.5,""tool_choice"":{""type"":""unknown""},""tools"":[{""name"":""test-tool"",""description"":""test-description"",""input_schema"":{""type"":""object"",""properties"":{""test-property"":{""type"":""string"",""description"":""test-description""}},""required"":[""test-property""]}}],""stream"":false}";
 
-    var action = () => Deserialize<ChatMessageRequest>(json);
+    var action = () => Deserialize<MessageRequest>(json);
 
     action.Should().Throw<JsonException>();
   }
@@ -384,27 +384,27 @@ public class ChatMessageRequestTests : SerializationTest
   [Fact]
   public void JsonDeserialization_WhenDeserializedWithImageContent_ItShouldHaveExpectedShape()
   {
-    var chatMessageRequest = Deserialize<ChatMessageRequest>(_testJsonWithImageContent);
+    var messageRequest = Deserialize<MessageRequest>(_testJsonWithImageContent);
 
-    chatMessageRequest!.Model.Should().Be(AnthropicModels.Claude3Sonnet);
-    chatMessageRequest.System.Should().Be("test-system");
-    chatMessageRequest.Messages.Should().HaveCount(1);
-    chatMessageRequest.MaxTokens.Should().Be(512);
-    chatMessageRequest.Metadata.Should().HaveCount(1);
+    messageRequest!.Model.Should().Be(AnthropicModels.Claude3Sonnet);
+    messageRequest.System.Should().Be("test-system");
+    messageRequest.Messages.Should().HaveCount(1);
+    messageRequest.MaxTokens.Should().Be(512);
+    messageRequest.Metadata.Should().HaveCount(1);
 
-    var testValue = chatMessageRequest.Metadata!.GetValueOrDefault("test")!.ToString();
+    var testValue = messageRequest.Metadata!.GetValueOrDefault("test")!.ToString();
     testValue.Should().Be("test");
 
-    chatMessageRequest.Temperature.Should().Be(0.5m);
-    chatMessageRequest.TopK.Should().Be(10);
-    chatMessageRequest.TopP.Should().Be(0.5m);
-    chatMessageRequest.ToolChoice.Should().BeOfType<AutoToolChoice>();
-    chatMessageRequest.ToolChoice!.Type.Should().Be("auto");
-    chatMessageRequest.Tools.Should().HaveCount(0);
-    chatMessageRequest.Messages[0].Content.Should().HaveCount(1);
-    chatMessageRequest.Messages[0].Content[0].Should().BeOfType<ImageContent>();
+    messageRequest.Temperature.Should().Be(0.5m);
+    messageRequest.TopK.Should().Be(10);
+    messageRequest.TopP.Should().Be(0.5m);
+    messageRequest.ToolChoice.Should().BeOfType<AutoToolChoice>();
+    messageRequest.ToolChoice!.Type.Should().Be("auto");
+    messageRequest.Tools.Should().HaveCount(0);
+    messageRequest.Messages[0].Content.Should().HaveCount(1);
+    messageRequest.Messages[0].Content[0].Should().BeOfType<ImageContent>();
 
-    var imageContent = chatMessageRequest.Messages[0].Content[0] as ImageContent;
+    var imageContent = messageRequest.Messages[0].Content[0] as ImageContent;
     imageContent!.Type.Should().Be("image");
     imageContent.Source.MediaType.Should().Be("image/jpeg");
     imageContent.Source.Data.Should().Be("data");
@@ -413,27 +413,27 @@ public class ChatMessageRequestTests : SerializationTest
   [Fact]
   public void JsonDeserialization_WhenDeserializedWithToolUseContent_ItShouldHaveExpectedShape()
   {
-    var chatMessageRequest = Deserialize<ChatMessageRequest>(_testJsonWithToolUseContent);
+    var messageRequest = Deserialize<MessageRequest>(_testJsonWithToolUseContent);
 
-    chatMessageRequest!.Model.Should().Be(AnthropicModels.Claude3Sonnet);
-    chatMessageRequest.System.Should().Be("test-system");
-    chatMessageRequest.Messages.Should().HaveCount(1);
-    chatMessageRequest.MaxTokens.Should().Be(512);
-    chatMessageRequest.Metadata.Should().HaveCount(1);
+    messageRequest!.Model.Should().Be(AnthropicModels.Claude3Sonnet);
+    messageRequest.System.Should().Be("test-system");
+    messageRequest.Messages.Should().HaveCount(1);
+    messageRequest.MaxTokens.Should().Be(512);
+    messageRequest.Metadata.Should().HaveCount(1);
 
-    var testValue = chatMessageRequest.Metadata!.GetValueOrDefault("test")!.ToString();
+    var testValue = messageRequest.Metadata!.GetValueOrDefault("test")!.ToString();
     testValue.Should().Be("test");
 
-    chatMessageRequest.Temperature.Should().Be(0.5m);
-    chatMessageRequest.TopK.Should().Be(10);
-    chatMessageRequest.TopP.Should().Be(0.5m);
-    chatMessageRequest.ToolChoice.Should().BeOfType<AutoToolChoice>();
-    chatMessageRequest.ToolChoice!.Type.Should().Be("auto");
-    chatMessageRequest.Tools.Should().HaveCount(0);
-    chatMessageRequest.Messages[0].Content.Should().HaveCount(1);
-    chatMessageRequest.Messages[0].Content[0].Should().BeOfType<ToolUseContent>();
+    messageRequest.Temperature.Should().Be(0.5m);
+    messageRequest.TopK.Should().Be(10);
+    messageRequest.TopP.Should().Be(0.5m);
+    messageRequest.ToolChoice.Should().BeOfType<AutoToolChoice>();
+    messageRequest.ToolChoice!.Type.Should().Be("auto");
+    messageRequest.Tools.Should().HaveCount(0);
+    messageRequest.Messages[0].Content.Should().HaveCount(1);
+    messageRequest.Messages[0].Content[0].Should().BeOfType<ToolUseContent>();
 
-    var toolUseContent = chatMessageRequest.Messages[0].Content[0] as ToolUseContent;
+    var toolUseContent = messageRequest.Messages[0].Content[0] as ToolUseContent;
     toolUseContent!.Type.Should().Be("tool_use");
     toolUseContent.Name.Should().Be("test-tool");
     toolUseContent.Id.Should().Be("test-tool-id");
@@ -444,27 +444,27 @@ public class ChatMessageRequestTests : SerializationTest
   [Fact]
   public void JsonDeserialization_WhenDeserializedWithToolResultContent_ItShouldHaveExpectedShape()
   {
-    var chatMessageRequest = Deserialize<ChatMessageRequest>(_testJsonWithToolResultContent);
+    var messageRequest = Deserialize<MessageRequest>(_testJsonWithToolResultContent);
 
-    chatMessageRequest!.Model.Should().Be(AnthropicModels.Claude3Sonnet);
-    chatMessageRequest.System.Should().Be("test-system");
-    chatMessageRequest.Messages.Should().HaveCount(1);
-    chatMessageRequest.MaxTokens.Should().Be(512);
-    chatMessageRequest.Metadata.Should().HaveCount(1);
+    messageRequest!.Model.Should().Be(AnthropicModels.Claude3Sonnet);
+    messageRequest.System.Should().Be("test-system");
+    messageRequest.Messages.Should().HaveCount(1);
+    messageRequest.MaxTokens.Should().Be(512);
+    messageRequest.Metadata.Should().HaveCount(1);
 
-    var testValue = chatMessageRequest.Metadata!.GetValueOrDefault("test")!.ToString();
+    var testValue = messageRequest.Metadata!.GetValueOrDefault("test")!.ToString();
     testValue.Should().Be("test");
 
-    chatMessageRequest.Temperature.Should().Be(0.5m);
-    chatMessageRequest.TopK.Should().Be(10);
-    chatMessageRequest.TopP.Should().Be(0.5m);
-    chatMessageRequest.ToolChoice.Should().BeOfType<AutoToolChoice>();
-    chatMessageRequest.ToolChoice!.Type.Should().Be("auto");
-    chatMessageRequest.Tools.Should().HaveCount(0);
-    chatMessageRequest.Messages[0].Content.Should().HaveCount(1);
-    chatMessageRequest.Messages[0].Content[0].Should().BeOfType<ToolResultContent>();
+    messageRequest.Temperature.Should().Be(0.5m);
+    messageRequest.TopK.Should().Be(10);
+    messageRequest.TopP.Should().Be(0.5m);
+    messageRequest.ToolChoice.Should().BeOfType<AutoToolChoice>();
+    messageRequest.ToolChoice!.Type.Should().Be("auto");
+    messageRequest.Tools.Should().HaveCount(0);
+    messageRequest.Messages[0].Content.Should().HaveCount(1);
+    messageRequest.Messages[0].Content[0].Should().BeOfType<ToolResultContent>();
 
-    var toolResultContent = chatMessageRequest.Messages[0].Content[0] as ToolResultContent;
+    var toolResultContent = messageRequest.Messages[0].Content[0] as ToolResultContent;
     toolResultContent!.Type.Should().Be("tool_result");
     toolResultContent.ToolUseId.Should().Be("test-tool");
     toolResultContent.Content.Should().Be("test-value");
@@ -473,7 +473,7 @@ public class ChatMessageRequestTests : SerializationTest
   [Fact]
   public void JsonDeserialization_WhenDeserializedWithUnknownContent_ItShouldThrowJsonException()
   {
-    var action = () => Deserialize<ChatMessageRequest>(_testJsonWithUnknownContent);
+    var action = () => Deserialize<MessageRequest>(_testJsonWithUnknownContent);
 
     action.Should().Throw<JsonException>();
   }

tests/AnthropicClient.Tests/Unit/Models/MessageResponseTests.cs

@@ -1,6 +1,6 @@
 namespace AnthropicClient.Tests.Unit.Models;
 
-public class ChatResponseTests : SerializationTest
+public class MessageResponseTests : SerializationTest
 {
   [Fact]
   public void Constructor_WhenCalled_ShouldInitializeProperties()
@@ -11,7 +11,7 @@ public class ChatResponseTests : SerializationTest
     var expectedStopReason = "stop reason";
     var expectedStopSequence = "stop sequence";
     var expectedType = "type";
-    var expectedUsage = new ChatUsage
+    var expectedUsage = new Usage
     {
       InputTokens = 1,
       OutputTokens = 2
@@ -21,7 +21,7 @@ public class ChatResponseTests : SerializationTest
       new TextContent("text content"),
     };
 
-    var chatResponse = new ChatResponse
+    var messageResponse = new MessageResponse
     {
       Id = expectedId,
       Model = expectedModel,
@@ -33,14 +33,14 @@ public class ChatResponseTests : SerializationTest
       Content = expectedContent
     };
 
-    chatResponse.Id.Should().Be(expectedId);
-    chatResponse.Model.Should().Be(expectedModel);
-    chatResponse.Role.Should().Be(expectedRole);
-    chatResponse.StopReason.Should().Be(expectedStopReason);
-    chatResponse.StopSequence.Should().Be(expectedStopSequence);
-    chatResponse.Type.Should().Be(expectedType);
-    chatResponse.Usage.Should().BeEquivalentTo(expectedUsage);
-    chatResponse.Content.Should().BeEquivalentTo(expectedContent);
+    messageResponse.Id.Should().Be(expectedId);
+    messageResponse.Model.Should().Be(expectedModel);
+    messageResponse.Role.Should().Be(expectedRole);
+    messageResponse.StopReason.Should().Be(expectedStopReason);
+    messageResponse.StopSequence.Should().Be(expectedStopSequence);
+    messageResponse.Type.Should().Be(expectedType);
+    messageResponse.Usage.Should().BeEquivalentTo(expectedUsage);
+    messageResponse.Content.Should().BeEquivalentTo(expectedContent);
   }
 
   [Fact]
@@ -59,7 +59,7 @@ public class ChatResponseTests : SerializationTest
       ]
     }";
 
-    var chatResponse = new ChatResponse
+    var messageResponse = new MessageResponse
     {
       Id = "id",
       Model = "model",
@@ -67,7 +67,7 @@ public class ChatResponseTests : SerializationTest
       StopReason = "stop reason",
       StopSequence = "stop sequence",
       Type = "type",
-      Usage = new ChatUsage
+      Usage = new Usage
       {
         InputTokens = 1,
         OutputTokens = 2
@@ -78,7 +78,7 @@ public class ChatResponseTests : SerializationTest
       ]
     };
 
-    var actual = Serialize(chatResponse);
+    var actual = Serialize(messageResponse);
 
     JsonAssert.Equal(expectedJson, actual);
   }
@@ -99,20 +99,20 @@ public class ChatResponseTests : SerializationTest
       ]
     }";
 
-    var chatResponse = Deserialize<ChatResponse>(json);
+    var messageResponse = Deserialize<MessageResponse>(json);
 
-    chatResponse!.Id.Should().Be("id");
-    chatResponse.Model.Should().Be("model");
-    chatResponse.Role.Should().Be("role");
-    chatResponse.StopReason.Should().Be("stop reason");
-    chatResponse.StopSequence.Should().Be("stop sequence");
-    chatResponse.Type.Should().Be("type");
-    chatResponse.Usage.Should().BeEquivalentTo(new ChatUsage
+    messageResponse!.Id.Should().Be("id");
+    messageResponse.Model.Should().Be("model");
+    messageResponse.Role.Should().Be("role");
+    messageResponse.StopReason.Should().Be("stop reason");
+    messageResponse.StopSequence.Should().Be("stop sequence");
+    messageResponse.Type.Should().Be("type");
+    messageResponse.Usage.Should().BeEquivalentTo(new Usage
     {
       InputTokens = 1,
       OutputTokens = 2
     });
-    chatResponse.Content.Should().BeEquivalentTo(new List<Content>
+    messageResponse.Content.Should().BeEquivalentTo(new List<Content>
     {
       new TextContent("text content"),
     });

tests/AnthropicClient.Tests/Unit/Models/MessageStartEventDataTests.cs

@@ -22,7 +22,7 @@ public class MessageStartEventDataTests : SerializationTest
   [Fact]
   public void Constructor_WhenCalled_ItShouldInitializeProperties()
   {
-    var expectedMessage = new ChatResponse
+    var expectedMessage = new MessageResponse
     {
       Id = "msg_1nZdL29xx5MUA1yADyHTEsnR8uuvGzszyY",
       Type = "message",
@@ -31,7 +31,7 @@ public class MessageStartEventDataTests : SerializationTest
       Model = "claude-3-5-sonnet-20240620",
       StopReason = string.Empty,
       StopSequence = string.Empty,
-      Usage = new ChatUsage { InputTokens = 25, OutputTokens = 1 }
+      Usage = new Usage { InputTokens = 25, OutputTokens = 1 }
     };
 
     var messageStartEventData = new MessageStartEventData(expectedMessage);
@@ -42,7 +42,7 @@ public class MessageStartEventDataTests : SerializationTest
   [Fact]
   public void JsonSerialization_WhenSerialized_ItShouldHaveExpectedShape()
   {
-    var expectedMessage = new ChatResponse
+    var expectedMessage = new MessageResponse
     {
       Id = "msg_1nZdL29xx5MUA1yADyHTEsnR8uuvGzszyY",
       Type = "message",
@@ -51,7 +51,7 @@ public class MessageStartEventDataTests : SerializationTest
       Model = "claude-3-5-sonnet-20240620",
       StopReason = string.Empty,
       StopSequence = string.Empty,
-      Usage = new ChatUsage { InputTokens = 25, OutputTokens = 1 }
+      Usage = new Usage { InputTokens = 25, OutputTokens = 1 }
     };
 
     var messageStartEventData = new MessageStartEventData(expectedMessage);
@@ -64,7 +64,7 @@ public class MessageStartEventDataTests : SerializationTest
   [Fact]
   public void JsonDeserialization_WhenDeserialized_ItShouldHaveExpectedValues()
   {
-    var expectedMessage = new ChatResponse
+    var expectedMessage = new MessageResponse
     {
       Id = "msg_1nZdL29xx5MUA1yADyHTEsnR8uuvGzszyY",
       Type = "message",
@@ -73,7 +73,7 @@ public class MessageStartEventDataTests : SerializationTest
       Model = "claude-3-5-sonnet-20240620",
       StopReason = string.Empty,
       StopSequence = string.Empty,
-      Usage = new ChatUsage { InputTokens = 25, OutputTokens = 1 }
+      Usage = new Usage { InputTokens = 25, OutputTokens = 1 }
     };
 
     var messageStartEventData = Deserialize<MessageStartEventData>(_testJson);

tests/AnthropicClient.Tests/Unit/Models/MessageTests.cs

@@ -1,6 +1,6 @@
 namespace AnthropicClient.Tests.Unit.Models;
 
-public class ChatMessageTests : SerializationTest
+public class MessageTests : SerializationTest
 {
   private readonly string _testJson = @"{
     ""role"": ""assistant"",
@@ -15,10 +15,10 @@ public class ChatMessageTests : SerializationTest
     var role = "assistant";
     var content = new List<Content> { new TextContent("text") };
 
-    var chatMessage = new ChatMessage(role, content);
+    var message = new Message(role, content);
 
-    chatMessage.Role.Should().Be(role);
-    chatMessage.Content.Should().BeSameAs(content);
+    message.Role.Should().Be(role);
+    message.Content.Should().BeSameAs(content);
   }
 
   [Fact]
@@ -26,7 +26,7 @@ public class ChatMessageTests : SerializationTest
   {
     var content = new List<Content> { new TextContent("text") };
 
-    var action = () => new ChatMessage(null!, content);
+    var action = () => new Message(null!, content);
 
     action.Should().Throw<ArgumentNullException>();
   }
@@ -36,7 +36,7 @@ public class ChatMessageTests : SerializationTest
   {
     var role = "assistant";
 
-    var action = () => new ChatMessage(role, null!);
+    var action = () => new Message(role, null!);
 
     action.Should().Throw<ArgumentNullException>();
   }
@@ -47,7 +47,7 @@ public class ChatMessageTests : SerializationTest
     var role = "invalid";
     var content = new List<Content> { new TextContent("text") };
 
-    var action = () => new ChatMessage(role, content);
+    var action = () => new Message(role, content);
 
     action.Should().Throw<ArgumentException>();
   }
@@ -57,22 +57,22 @@ public class ChatMessageTests : SerializationTest
   {
     var role = "assistant";
     var content = new List<Content> { new TextContent("text") };
-    var chatMessage = new ChatMessage(role, content);
+    var message = new Message(role, content);
 
-    var actual = Serialize(chatMessage);
+    var actual = Serialize(message);
 
     JsonAssert.Equal(_testJson, actual);
   }
 
   [Fact]
-  public void JsonDeserialization_WhenDeserialized_ItShouldReturnChatMessage()
+  public void JsonDeserialization_WhenDeserialized_ItShouldReturnMessage()
   {
-    var chatMessage = Deserialize<ChatMessage>(_testJson);
+    var message = Deserialize<Message>(_testJson);
 
-    chatMessage.Should().NotBeNull();
-    chatMessage!.Role.Should().Be("assistant");
-    chatMessage.Content.Should().HaveCount(1);
-    chatMessage.Content[0].Should().BeOfType<TextContent>();
-    chatMessage.Content[0].As<TextContent>().Text.Should().Be("text");
+    message.Should().NotBeNull();
+    message!.Role.Should().Be("assistant");
+    message.Content.Should().HaveCount(1);
+    message.Content[0].Should().BeOfType<TextContent>();
+    message.Content[0].As<TextContent>().Text.Should().Be("text");
   }
 }

tests/AnthropicClient.Tests/Unit/Models/StreamMessageRequestTests.cs

@@ -1,6 +1,6 @@
 namespace AnthropicClient.Tests.Unit.Models;
 
-public class StreamChatMessageRequestTests : SerializationTest
+public class StreamMessageRequestTests : SerializationTest
 {
   private readonly string _testJson = @"{
     ""model"": ""claude-3-sonnet-20240229"",
@@ -23,7 +23,7 @@ public class StreamChatMessageRequestTests : SerializationTest
   public void Constructor_WhenCalled_ItShouldInitializeProperties()
   {
     var model = AnthropicModels.Claude3Sonnet;
-    var messages = new List<ChatMessage> { new() };
+    var messages = new List<Message> { new() };
     var maxTokens = 512;
     var system = "test-system";
     var metadata = new Dictionary<string, object> { ["test"] = "test" };
@@ -33,7 +33,7 @@ public class StreamChatMessageRequestTests : SerializationTest
     var toolChoice = new AutoToolChoice();
     var tools = new List<Tool>();
 
-    var chatMessageRequest = new StreamChatMessageRequest(
+    var messageRequest = new StreamMessageRequest(
       model: model,
       messages: messages,
       maxTokens: maxTokens,
@@ -46,23 +46,23 @@ public class StreamChatMessageRequestTests : SerializationTest
       tools: tools
     );
 
-    chatMessageRequest.Model.Should().Be(model);
-    chatMessageRequest.Messages.Should().BeSameAs(messages);
-    chatMessageRequest.MaxTokens.Should().Be(maxTokens);
-    chatMessageRequest.System.Should().Be(system);
-    chatMessageRequest.Metadata.Should().BeSameAs(metadata);
-    chatMessageRequest.Temperature.Should().Be(temperature);
-    chatMessageRequest.TopK.Should().Be(topK);
-    chatMessageRequest.TopP.Should().Be(topP);
-    chatMessageRequest.ToolChoice.Should().Be(toolChoice);
-    chatMessageRequest.Tools.Should().BeSameAs(tools);
-    chatMessageRequest.Stream.Should().BeTrue();
+    messageRequest.Model.Should().Be(model);
+    messageRequest.Messages.Should().BeSameAs(messages);
+    messageRequest.MaxTokens.Should().Be(maxTokens);
+    messageRequest.System.Should().Be(system);
+    messageRequest.Metadata.Should().BeSameAs(metadata);
+    messageRequest.Temperature.Should().Be(temperature);
+    messageRequest.TopK.Should().Be(topK);
+    messageRequest.TopP.Should().Be(topP);
+    messageRequest.ToolChoice.Should().Be(toolChoice);
+    messageRequest.Tools.Should().BeSameAs(tools);
+    messageRequest.Stream.Should().BeTrue();
   }
 
   [Fact]
   public void Constructor_WhenCalledAndModelIsNull_ItShouldThrowArgumentNullException()
   {
-    var action = () => new StreamChatMessageRequest(
+    var action = () => new StreamMessageRequest(
       model: null!,
       messages: [new()]
     );
@@ -73,7 +73,7 @@ public class StreamChatMessageRequestTests : SerializationTest
   [Fact]
   public void Constructor_WhenCalledAndMessagesIsNull_ItShouldThrowArgumentNullException()
   {
-    var action = () => new StreamChatMessageRequest(
+    var action = () => new StreamMessageRequest(
       model: AnthropicModels.Claude3Sonnet,
       messages: null!
     );
@@ -84,7 +84,7 @@ public class StreamChatMessageRequestTests : SerializationTest
   [Fact]
   public void Constructor_WhenCalledAndModelIsInvalid_ItShouldThrowArgumentException()
   {
-    var action = () => new StreamChatMessageRequest(
+    var action = () => new StreamMessageRequest(
       model: "invalid-model",
       messages: [new()]
     );
@@ -95,7 +95,7 @@ public class StreamChatMessageRequestTests : SerializationTest
   [Fact]
   public void Constructor_WhenCalledAndMessagesIsEmpty_ItShouldThrowArgumentException()
   {
-    var action = () => new StreamChatMessageRequest(
+    var action = () => new StreamMessageRequest(
       model: AnthropicModels.Claude3Sonnet,
       messages: []
     );
@@ -106,7 +106,7 @@ public class StreamChatMessageRequestTests : SerializationTest
   [Fact]
   public void Constructor_WhenCalledAndMaxTokensIsInvalid_ItShouldThrowArgumentException()
   {
-    var action = () => new StreamChatMessageRequest(
+    var action = () => new StreamMessageRequest(
       model: AnthropicModels.Claude3Sonnet,
       messages: [new()],
       maxTokens: 0
@@ -120,7 +120,7 @@ public class StreamChatMessageRequestTests : SerializationTest
   [InlineData(2)]
   public void Constructor_WhenCalledAndTemperatureIsInvalid_ItShouldThrowArgumentException(decimal temperature)
   {
-    var action = () => new StreamChatMessageRequest(
+    var action = () => new StreamMessageRequest(
       model: AnthropicModels.Claude3Sonnet,
       messages: [new()],
       temperature: temperature
@@ -132,7 +132,7 @@ public class StreamChatMessageRequestTests : SerializationTest
   [Fact]
   public void JsonSerialization_WhenSerialized_ItShouldHaveExpectedShape()
   {
-    var messages = new List<ChatMessage>()
+    var messages = new List<Message>()
     {
       new()
       {
@@ -154,7 +154,7 @@ public class StreamChatMessageRequestTests : SerializationTest
     var toolChoice = new AutoToolChoice();
     var tools = new List<Tool>();
 
-    var chatMessageRequest = new StreamChatMessageRequest(
+    var messageRequest = new StreamMessageRequest(
       model: model,
       messages: messages,
       maxTokens: maxTokens,
@@ -167,7 +167,7 @@ public class StreamChatMessageRequestTests : SerializationTest
       tools: tools
     );
 
-    var actual = Serialize(chatMessageRequest);
+    var actual = Serialize(messageRequest);
 
     JsonAssert.Equal(_testJson, actual);
   }
@@ -175,23 +175,23 @@ public class StreamChatMessageRequestTests : SerializationTest
   [Fact]
   public void JsonDeserialization_WhenDeserialized_ItShouldHaveExpectedShape()
   {
-    var chatMessageRequest = Deserialize<StreamChatMessageRequest>(_testJson);
+    var messageRequest = Deserialize<StreamMessageRequest>(_testJson);
 
-    chatMessageRequest!.Model.Should().Be(AnthropicModels.Claude3Sonnet);
-    chatMessageRequest.System.Should().Be("test-system");
-    chatMessageRequest.Messages.Should().HaveCount(1);
-    chatMessageRequest.MaxTokens.Should().Be(512);
-    chatMessageRequest.Metadata.Should().HaveCount(1);
+    messageRequest!.Model.Should().Be(AnthropicModels.Claude3Sonnet);
+    messageRequest.System.Should().Be("test-system");
+    messageRequest.Messages.Should().HaveCount(1);
+    messageRequest.MaxTokens.Should().Be(512);
+    messageRequest.Metadata.Should().HaveCount(1);
 
-    var testValue = chatMessageRequest.Metadata!.GetValueOrDefault("test")!.ToString();
+    var testValue = messageRequest.Metadata!.GetValueOrDefault("test")!.ToString();
     testValue.Should().Be("test");
 
-    chatMessageRequest.Temperature.Should().Be(0.5m);
-    chatMessageRequest.TopK.Should().Be(10);
-    chatMessageRequest.TopP.Should().Be(0.5m);
-    chatMessageRequest.ToolChoice.Should().BeOfType<AutoToolChoice>();
-    chatMessageRequest.ToolChoice!.Type.Should().Be("auto");
-    chatMessageRequest.Tools.Should().HaveCount(0);
-    chatMessageRequest.Stream.Should().BeTrue();
+    messageRequest.Temperature.Should().Be(0.5m);
+    messageRequest.TopK.Should().Be(10);
+    messageRequest.TopP.Should().Be(0.5m);
+    messageRequest.ToolChoice.Should().BeOfType<AutoToolChoice>();
+    messageRequest.ToolChoice!.Type.Should().Be("auto");
+    messageRequest.Tools.Should().HaveCount(0);
+    messageRequest.Stream.Should().BeTrue();
   }
 }

tests/AnthropicClient.Tests/Unit/Models/UsageTests.cs

@@ -1,6 +1,6 @@
 namespace AnthropicClient.Tests.Unit.Models;
 
-public class ChatUsageTests : SerializationTest
+public class UsageTests : SerializationTest
 {
   [Fact]
   public void Constructor_WhenCalled_ShouldInitializeProperties()
@@ -8,14 +8,14 @@ public class ChatUsageTests : SerializationTest
     var expectedInputTokens = 1;
     var expectedOutputTokens = 2;
 
-    var chatUsage = new ChatUsage
+    var usage = new Usage
     {
       InputTokens = expectedInputTokens,
       OutputTokens = expectedOutputTokens
     };
 
-    chatUsage.InputTokens.Should().Be(expectedInputTokens);
-    chatUsage.OutputTokens.Should().Be(expectedOutputTokens);
+    usage.InputTokens.Should().Be(expectedInputTokens);
+    usage.OutputTokens.Should().Be(expectedOutputTokens);
   }
 
   [Fact]
@@ -23,13 +23,13 @@ public class ChatUsageTests : SerializationTest
   {
     var expectedJson = @"{ ""input_tokens"": 1, ""output_tokens"": 2 }";
 
-    var chatUsage = new ChatUsage
+    var usage = new Usage
     {
       InputTokens = 1,
       OutputTokens = 2
     };
 
-    var actual = Serialize(chatUsage);
+    var actual = Serialize(usage);
 
     JsonAssert.Equal(expectedJson, actual);
   }
@@ -39,9 +39,9 @@ public class ChatUsageTests : SerializationTest
   {
     var json = @"{ ""input_tokens"": 1, ""output_tokens"": 2 }";
 
-    var chatUsage = Deserialize<ChatUsage>(json);
+    var usage = Deserialize<Usage>(json);
 
-    chatUsage!.InputTokens.Should().Be(1);
-    chatUsage.OutputTokens.Should().Be(2);
+    usage!.InputTokens.Should().Be(1);
+    usage.OutputTokens.Should().Be(2);
   }
 }

tests/AnthropicClient.Tests/Unit/Utils/JsonSchemaGeneratorTests.cs

@@ -1,5 +1,3 @@
-using System.Text.Json.Nodes;
-
 namespace AnthropicClient.Tests.Unit.Utils;
 
 public class JsonSchemaGeneratorTests

tests/AnthropicClient.Tests/Usings.cs

@@ -1,10 +1,13 @@
 global using System.Text;
 global using System.Text.Json;
+global using System.Text.Json.Nodes;
 global using System.Text.Json.JsonDiffPatch.Xunit;
 
 global using AnthropicClient.Models;
 global using AnthropicClient.Utils;
 global using AnthropicClient.Json;
+global using AnthropicClient.Tests.Data;
+global using AnthropicClient.Tests.Fixtures;
 
 global using FluentAssertions;
 
@@ -12,4 +15,4 @@ global using Microsoft.Extensions.Configuration;
 
 global using RichardSzalay.MockHttp;
 global using System.Net;
-global using System.Collections;
+global using System.Collections;