cohere v2 endpoints wip

Author: lofcz

src/LlmTornado.Demo/ChatDemo.cs

@@ -144,6 +144,32 @@ public static async Task<bool> ChatFunctionRequired()
         return false;
     }
 
+    [TornadoTest]
+    public static async Task<bool> CohereTool()
+    {
+        Conversation chat = Program.Connect().Chat.CreateConversation(new ChatRequest
+        {
+            Model = ChatModel.Cohere.Command.A0325,
+            Tools = [new Tool(new ToolFunction("get_weather", "gets the current weather"), true)],
+            ToolChoice = new OutboundToolChoice(OutboundToolChoiceModes.Required),
+            Messages = [
+                new ChatMessage(ChatMessageRoles.User, "What is the weather like today?")
+            ]
+        });
+ 
+        ChatRichResponse response = await chat.GetResponseRich();
+
+        ChatRichResponseBlock? block = response.Blocks?.FirstOrDefault(x => x.Type is ChatRichResponseBlockTypes.Function);
+
+        if (block is not null)
+        {
+            Console.WriteLine($"fn block found: {block.FunctionCall?.Name}");
+            return true;
+        }
+        
+        return false;
+    }
+    
     [TornadoTest]
     public static async Task<bool> ChatFunctionGemini()
     {

src/LlmTornado/Chat/ChatRequest.cs

@@ -504,7 +504,7 @@ private static string PreparePayload(JObject sourceObject, ChatRequest context,
 		return sourceObject.ToString(settings?.Formatting ?? Formatting.None);
 	}
 
-	private static readonly Dictionary<LLmProviders, Func<ChatRequest, IEndpointProvider, CapabilityEndpoints, JsonSerializerSettings?, string>> SerializeMap = new Dictionary<LLmProviders, Func<ChatRequest, IEndpointProvider, CapabilityEndpoints, JsonSerializerSettings?, string>>((int)LLmProviders.Length)
+	private static readonly Dictionary<LLmProviders, Func<ChatRequest, IEndpointProvider, CapabilityEndpoints, JsonSerializerSettings?, string>> serializeMap = new Dictionary<LLmProviders, Func<ChatRequest, IEndpointProvider, CapabilityEndpoints, JsonSerializerSettings?, string>>((int)LLmProviders.Length)
 	{
 		{
 			LLmProviders.OpenAi, (x, y, z, a) =>
@@ -530,7 +530,14 @@ private static string PreparePayload(JObject sourceObject, ChatRequest context,
 		},
 		{ LLmProviders.DeepSeek, (x, y, z, a) => PreparePayload(x, x, y, z, GetSerializer(EndpointBase.NullSettings, a)) },
 		{ LLmProviders.Anthropic, (x, y, z, a) => PreparePayload(new VendorAnthropicChatRequest(x, y), x, y, z, GetSerializer(EndpointBase.NullSettings, a)) },
-		{ LLmProviders.Cohere, (x, y, z, a) => PreparePayload(new VendorCohereChatRequest(x, y), x, y, z, GetSerializer(EndpointBase.NullSettings, a)) },
+		{
+			LLmProviders.Cohere, (x, y, z, a) =>
+			{
+				VendorCohereChatRequest request = new VendorCohereChatRequest(x, y);
+				JsonSerializerSettings serializer = GetSerializer(EndpointBase.NullSettings, a);
+				return PreparePayload(request.Serialize(serializer), x, y, z, serializer);
+			}
+		},
 		{ LLmProviders.Google, (x, y, z, a) => PreparePayload(new VendorGoogleChatRequest(x, y), x, y, z, GetSerializer(EndpointBase.NullSettings, a)) },
 		{
 			LLmProviders.Mistral, (x, y, z, a) =>
@@ -730,7 +737,7 @@ private TornadoRequestContent Serialize(IEndpointProvider provider, CapabilityEn
 			outboundCopy.ReasoningFormat = null;
 		}
 
-		TornadoRequestContent serialized = SerializeMap.TryGetValue(provider.Provider, out Func<ChatRequest, IEndpointProvider, CapabilityEndpoints, JsonSerializerSettings?, string>? serializerFn) ? new TornadoRequestContent(serializerFn.Invoke(outboundCopy, provider, capabilityEndpoint, pretty ? new JsonSerializerSettings
+		TornadoRequestContent serialized = serializeMap.TryGetValue(provider.Provider, out Func<ChatRequest, IEndpointProvider, CapabilityEndpoints, JsonSerializerSettings?, string>? serializerFn) ? new TornadoRequestContent(serializerFn.Invoke(outboundCopy, provider, capabilityEndpoint, pretty ? new JsonSerializerSettings
 		{
 			Formatting = Formatting.Indented
 		} : null), outboundCopy.Model, outboundCopy.UrlOverride, provider, capabilityEndpoint) : new TornadoRequestContent(string.Empty, outboundCopy.Model, outboundCopy.UrlOverride, provider, CapabilityEndpoints.Chat);

src/LlmTornado/Chat/ChatResult.cs

@@ -295,8 +295,8 @@ internal ChatUsage(VendorPerplexityUsage usage)
 
 	internal ChatUsage(VendorCohereUsage usage)
 	{
-		CompletionTokens = usage.BilledUnits.OutputTokens;
-		PromptTokens = usage.BilledUnits.OutputTokens;
+		CompletionTokens = usage.BilledUnits?.OutputTokens ?? 0;
+		PromptTokens = usage.BilledUnits?.OutputTokens ?? 0;
 		TotalTokens = CompletionTokens + PromptTokens;
 		VendorUsageObject = usage;
 		Provider = LLmProviders.Cohere;

src/LlmTornado/Chat/Vendors/Cohere/ChatResponseVendorCohereExtensions.cs

@@ -49,7 +49,7 @@ public ChatResponseVendorCohereExtensions()
     /// <returns></returns>
     public List<VendorCohereCitationBlock> ParseCitations()
     {
-        return ParseCitations(Response.Text ?? string.Empty);
+        return []; // ParseCitations(Response.Message ?? string.Empty);
     }
 
     /// <summary>
@@ -128,10 +128,10 @@ string ClearSnippet(string txt)
 
     internal ChatResponseVendorCohereExtensions(VendorCohereChatResult response)
     {
-        Citations = response.Citations;
+        /*Citations = response.Citations;
         Documents = response.Documents;
         SearchQueries = response.SearchQueries;
         SearchResults = response.SearchResults;
-        Response = response;
+        Response = response;*/
     }
 }