Added Support for ToolUse and Namespace renaming. V 8.0.2

betalgo · Jul 22, 2024 · 167ee45 · 167ee45
1 parent 486e9cf
commit 167ee45
Show file tree

Hide file tree

Showing 28 changed files with 58 additions and 40 deletions.
diff --git a/Anthropic.Playground/TestHelpers/ChatTestHelper.cs b/Anthropic.Playground/TestHelpers/ChatTestHelper.cs
@@ -1,5 +1,5 @@
-using Anthropic.ObjectModels.ResponseModels;
-using Anthropic.ObjectModels.SharedModels;
+using Anthropic.ApiModels.ResponseModels;
+using Anthropic.ApiModels.SharedModels;
 using Anthropic.Services;
 
 namespace Anthropic.Playground.TestHelpers;

diff --git a/Anthropic.Playground/TestHelpers/ChatToolUseTestHelper.cs b/Anthropic.Playground/TestHelpers/ChatToolUseTestHelper.cs
@@ -1,6 +1,6 @@
-using Anthropic.Extensions;
-using Anthropic.ObjectModels.ResponseModels;
-using Anthropic.ObjectModels.SharedModels;
+using Anthropic.ApiModels.ResponseModels;
+using Anthropic.ApiModels.SharedModels;
+using Anthropic.Extensions;
 using Anthropic.Playground.SampleModels;
 using Anthropic.Services;
 

diff --git a/Anthropic/Anthropic.csproj b/Anthropic/Anthropic.csproj
@@ -10,7 +10,7 @@
 		<PackageIcon>Ranul-Anthropic-Icon.png</PackageIcon>
 		<GeneratePackageOnBuild>true</GeneratePackageOnBuild>
 		<Title>Anthropic Claude C# .NET library by Ranul Betalgo</Title>
-		<Version>8.0.1</Version>
+		<Version>8.0.2</Version>
 		<Authors>Tolga Kayhan, Betalgo, Ranul</Authors>
 		<Company>Betalgo Up Ltd.</Company>
 		<Product>Anthropic Claude C# .NET library by Ranul Betalgo</Product>

diff --git a/Anthropic/ApiModels/AnthropicOptions.cs b/Anthropic/ApiModels/AnthropicOptions.cs
@@ -1,4 +1,4 @@
-namespace Anthropic.ObjectModels;
+namespace Anthropic.ApiModels;
 
 public class AnthropicOptions
 {

diff --git a/Anthropic/ApiModels/AnthropicProviderType.cs b/Anthropic/ApiModels/AnthropicProviderType.cs
@@ -1,4 +1,4 @@
-namespace Anthropic.ObjectModels;
+namespace Anthropic.ApiModels;
 
 /// <summary>
 ///     Anthropic Provider Type

diff --git a/Anthropic/ApiModels/IObjectInterfaces.cs b/Anthropic/ApiModels/IObjectInterfaces.cs
@@ -1,4 +1,4 @@
-namespace Anthropic.ObjectModels;
+namespace Anthropic.ApiModels;
 
 public interface IObjectInterfaces
 {

diff --git a/Anthropic/ApiModels/JsonConverters.cs b/Anthropic/ApiModels/JsonConverters.cs
@@ -1,8 +1,8 @@
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Anthropic.ObjectModels.SharedModels;
+using Anthropic.ApiModels.SharedModels;
 
-namespace Anthropic.ObjectModels;
+namespace Anthropic.ApiModels;
 
 internal class JsonConverters
 {

diff --git a/Anthropic/ApiModels/RequestModels/MessageRequest.cs b/Anthropic/ApiModels/RequestModels/MessageRequest.cs
@@ -1,6 +1,5 @@
 using System.Text.Json.Serialization;
-using Anthropic.ObjectModels;
-using Anthropic.ObjectModels.SharedModels;
+using Anthropic.ApiModels.SharedModels;
 
 namespace Anthropic.ApiModels.RequestModels;
 

diff --git a/Anthropic/ApiModels/ResponseModels/BaseResponse.cs b/Anthropic/ApiModels/ResponseModels/BaseResponse.cs
@@ -1,9 +1,9 @@
 using System.Net;
 using System.Net.Http.Headers;
 using System.Text.Json.Serialization;
-using Anthropic.ObjectModels.SharedModels;
+using Anthropic.ApiModels.SharedModels;
 
-namespace Anthropic.ObjectModels.ResponseModels;
+namespace Anthropic.ApiModels.ResponseModels;
 
 public class TypeBaseResponse : IType
 {

diff --git a/Anthropic/ApiModels/ResponseModels/MessageResponse.cs b/Anthropic/ApiModels/ResponseModels/MessageResponse.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Anthropic.ObjectModels.SharedModels;
+using Anthropic.ApiModels.SharedModels;
 
-namespace Anthropic.ObjectModels.ResponseModels;
+namespace Anthropic.ApiModels.ResponseModels;
 
 public class PingResponse : BaseResponse, IStreamResponse
 {

diff --git a/Anthropic/ApiModels/ResponseModels/RateLimitInfo.cs b/Anthropic/ApiModels/ResponseModels/RateLimitInfo.cs
@@ -1,7 +1,7 @@
 using System.Net.Http.Headers;
 using Anthropic.Extensions;
 
-namespace Anthropic.ObjectModels.ResponseModels;
+namespace Anthropic.ApiModels.ResponseModels;
 
 /// <summary>
 ///     Represents rate limit information from Anthropic API headers.

diff --git a/Anthropic/ApiModels/ResponseModels/ResponseHeaderValues.cs b/Anthropic/ApiModels/ResponseModels/ResponseHeaderValues.cs
@@ -1,6 +1,6 @@
 using Anthropic.Extensions;
 
-namespace Anthropic.ObjectModels.ResponseModels;
+namespace Anthropic.ApiModels.ResponseModels;
 
 /// <summary>
 ///     Represents the values of various headers in an HTTP response.

diff --git a/Anthropic/ApiModels/SharedModels/ContentBlock.cs b/Anthropic/ApiModels/SharedModels/ContentBlock.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Anthropic.ObjectModels.ResponseModels;
+using Anthropic.ApiModels.ResponseModels;
 
-namespace Anthropic.ObjectModels.SharedModels;
+namespace Anthropic.ApiModels.SharedModels;
 
 public class ContentBlock : TypeBaseResponse
 {
@@ -30,6 +30,14 @@ public class ContentBlock : TypeBaseResponse
     [JsonIgnore]
     public bool IsToolUse => Type == "tool_use";
 
+    [JsonPropertyName("tool_use_id")]
+
+    public string? ToolUseId { get; set; }
+
+    [JsonPropertyName("content")]
+
+    public List<ContentBlock>? Content { get; set; }
+
     public static ContentBlock CreateText(string? text)
     {
         return new()
@@ -62,4 +70,15 @@ public static ContentBlock CreateToolUse(object input, string? id, string? name)
             Input = input
         };
     }
+
+    public static ContentBlock CreateToolResult(object input, string toolUseId, List<ContentBlock>? content)
+    {
+        return new()
+        {
+            Type = "tool_result",
+            ToolUseId = toolUseId,
+            Input = input,
+            Content = content
+        };
+    }
 }
diff --git a/Anthropic/ApiModels/SharedModels/ImageSource.cs b/Anthropic/ApiModels/SharedModels/ImageSource.cs
@@ -1,7 +1,7 @@
 using System.Text.Json.Serialization;
-using Anthropic.ObjectModels.ResponseModels;
+using Anthropic.ApiModels.ResponseModels;
 
-namespace Anthropic.ObjectModels.SharedModels;
+namespace Anthropic.ApiModels.SharedModels;
 
 public class ImageSource : TypeBaseResponse
 {

diff --git a/Anthropic/ApiModels/SharedModels/Message.cs b/Anthropic/ApiModels/SharedModels/Message.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Anthropic.ObjectModels.SharedModels;
+namespace Anthropic.ApiModels.SharedModels;
 
 public class Message
 {

diff --git a/Anthropic/ApiModels/SharedModels/Metadata.cs b/Anthropic/ApiModels/SharedModels/Metadata.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Anthropic.ObjectModels.SharedModels;
+namespace Anthropic.ApiModels.SharedModels;
 
 /// <summary>
 ///     Represents metadata about the request.

diff --git a/Anthropic/ApiModels/SharedModels/Tool.cs b/Anthropic/ApiModels/SharedModels/Tool.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Anthropic.ObjectModels.SharedModels;
+namespace Anthropic.ApiModels.SharedModels;
 
 /// <summary>
 ///     Represents a tool definition that the model may use.

diff --git a/Anthropic/ApiModels/SharedModels/ToolChoice.cs b/Anthropic/ApiModels/SharedModels/ToolChoice.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Anthropic.ObjectModels.SharedModels;
+namespace Anthropic.ApiModels.SharedModels;
 
 /// <summary>
 ///     Represents how the model should use the provided tools.

diff --git a/Anthropic/ApiModels/SharedModels/ToolParameters.cs b/Anthropic/ApiModels/SharedModels/ToolParameters.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Anthropic.ObjectModels.SharedModels;
+namespace Anthropic.ApiModels.SharedModels;
 
 /// <summary>
 ///     Function parameter is a JSON Schema object.

diff --git a/Anthropic/ApiModels/SharedModels/Usage.cs b/Anthropic/ApiModels/SharedModels/Usage.cs
@@ -1,6 +1,6 @@
 using System.Text.Json.Serialization;
 
-namespace Anthropic.ObjectModels.SharedModels;
+namespace Anthropic.ApiModels.SharedModels;
 
 public class Usage
 {

diff --git a/Anthropic/ApiModels/StaticValues.cs b/Anthropic/ApiModels/StaticValues.cs
@@ -1,4 +1,4 @@
-namespace Anthropic.ObjectModels;
+namespace Anthropic.ApiModels;
 
 internal class StaticValues
 {

diff --git a/Anthropic/Extensions/AnthropicServiceCollectionExtensions.cs b/Anthropic/Extensions/AnthropicServiceCollectionExtensions.cs
@@ -1,4 +1,4 @@
-using Anthropic.ObjectModels;
+using Anthropic.ApiModels;
 using Anthropic.Services;
 using Microsoft.Extensions.DependencyInjection;
 

diff --git a/Anthropic/Extensions/ContentBlockExtensions.cs b/Anthropic/Extensions/ContentBlockExtensions.cs
@@ -1,5 +1,5 @@
 using System.Text.Json;
-using Anthropic.ObjectModels.SharedModels;
+using Anthropic.ApiModels.SharedModels;
 
 namespace Anthropic.Extensions;
 

diff --git a/Anthropic/Extensions/HttpClientExtensions.cs b/Anthropic/Extensions/HttpClientExtensions.cs
@@ -2,7 +2,7 @@
 using System.Net.Http.Json;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Anthropic.ObjectModels.ResponseModels;
+using Anthropic.ApiModels.ResponseModels;
 
 namespace Anthropic.Extensions;
 

diff --git a/Anthropic/Extensions/ModelExtension.cs b/Anthropic/Extensions/ModelExtension.cs
@@ -1,4 +1,4 @@
-using Anthropic.ObjectModels;
+using Anthropic.ApiModels;
 
 namespace Anthropic.Extensions;
 

diff --git a/Anthropic/Extensions/StreamHandleExtension.cs b/Anthropic/Extensions/StreamHandleExtension.cs
@@ -2,9 +2,9 @@
 using System.Text;
 using System.Text.Json;
 using System.Text.Json.Serialization;
-using Anthropic.ObjectModels;
-using Anthropic.ObjectModels.ResponseModels;
-using Anthropic.ObjectModels.SharedModels;
+using Anthropic.ApiModels;
+using Anthropic.ApiModels.ResponseModels;
+using Anthropic.ApiModels.SharedModels;
 using static Anthropic.Extensions.StreamPartialResponse;
 
 namespace Anthropic.Extensions;

diff --git a/Anthropic/Services/AnthropicMessagesService.cs b/Anthropic/Services/AnthropicMessagesService.cs
@@ -1,7 +1,7 @@
 using System.Runtime.CompilerServices;
 using Anthropic.ApiModels.RequestModels;
+using Anthropic.ApiModels.ResponseModels;
 using Anthropic.Extensions;
-using Anthropic.ObjectModels.ResponseModels;
 
 namespace Anthropic.Services;
 

diff --git a/Anthropic/Services/AnthropicService.cs b/Anthropic/Services/AnthropicService.cs
@@ -1,5 +1,5 @@
-using Anthropic.EndpointProviders;
-using Anthropic.ObjectModels;
+using Anthropic.ApiModels;
+using Anthropic.EndpointProviders;
 using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Options;