Merge pull request #210 from databyjp/bugfix/model-configs-review-pt2

Author: mpartipilo

src/Weaviate.Client/Models/Generative/Providers.cs

@@ -171,4 +171,15 @@ public record XAI() : Weaviate.Client.Models.GenerativeProvider("xai")
         public List<string>? Images { get; set; }
         public List<string>? ImageProperties { get; set; }
     }
+
+    public record ContextualAI() : Weaviate.Client.Models.GenerativeProvider("contextualai")
+    {
+        public string? Model { get; set; }
+        public double? Temperature { get; set; }
+        public double? TopP { get; set; }
+        public long? MaxNewTokens { get; set; }
+        public string? SystemPrompt { get; set; }
+        public bool? AvoidCommentary { get; set; }
+        public string[]? Knowledge { get; set; }
+    }
 }

src/Weaviate.Client/Models/GenerativeConfig.cs

@@ -19,13 +19,16 @@ public record Custom : IGenerativeConfig
 
     public abstract record OpenAIBase : IGenerativeConfig
     {
+        public string? Model { get; set; }
         public string? BaseURL { get; set; }
         public int? FrequencyPenalty { get; set; }
         public int? MaxTokens { get; set; }
         public int? PresencePenalty { get; set; }
         public double? Temperature { get; set; }
         public double? TopP { get; set; }
         public string? ApiVersion { get; set; }
+        public string? ReasoningEffort { get; set; }
+        public string? Verbosity { get; set; }
         public abstract string Type { get; }
     }
 
@@ -144,10 +147,6 @@ public record OpenAI : OpenAIBase
     {
         public const string TypeValue = "generative-openai";
         public override string Type => TypeValue;
-
-        public string? Model { get; set; }
-        public string? ReasoningEffort { get; set; }
-        public string? Verbosity { get; set; }
     }
 
     public record AzureOpenAI : OpenAIBase
@@ -187,4 +186,18 @@ public record XAI : IGenerativeConfig
         public double? Temperature { get; set; }
         public double? TopP { get; set; }
     }
+
+    public record ContextualAI : IGenerativeConfig
+    {
+        public const string TypeValue = "generative-contextualai";
+        public string Type => TypeValue;
+
+        public string? Model { get; set; }
+        public double? Temperature { get; set; }
+        public double? TopP { get; set; }
+        public long? MaxNewTokens { get; set; }
+        public string? SystemPrompt { get; set; }
+        public bool? AvoidCommentary { get; set; }
+        public string[]? Knowledge { get; set; }
+    }
 }

src/Weaviate.Client/Models/RerankerConfig.cs

@@ -31,12 +31,21 @@ public static class Models
         }
     }
 
+    public record ContextualAI : IRerankerConfig
+    {
+        public const string TypeValue = "reranker-contextualai";
+        public string Type => TypeValue;
+
+        public string? Model { get; set; }
+        public string? Instruction { get; set; }
+        public int? TopN { get; set; }
+    }
+
     public record VoyageAI : IRerankerConfig
     {
         public const string TypeValue = "reranker-voyageai";
         public string Type => TypeValue;
 
-        public string? BaseURL { get; set; }
         public string? Model { get; set; }
 
         public static class Models

src/Weaviate.Client/gRPC/Search.Builders.cs

@@ -352,6 +352,19 @@ private static V1.GenerativeProvider GetGenerativeProvider(Models.GenerativeProv
                 SetIfNotNull(v => result.Xai.TopP = (float)v, a.TopP);
                 SetIfNotNull(v => result.Xai.MaxTokens = v, a.MaxTokens);
                 break;
+            case Models.Generative.Providers.ContextualAI a:
+                result.Contextualai = new V1.GenerativeContextualAI
+                {
+                    Model = a.Model ?? string.Empty,
+                    SystemPrompt = a.SystemPrompt ?? string.Empty,
+                    Knowledge =
+                        a.Knowledge != null ? new V1.TextArray { Values = { a.Knowledge } } : null,
+                };
+                SetIfNotNull(v => result.Contextualai.Temperature = (float)v, a.Temperature);
+                SetIfNotNull(v => result.Contextualai.TopP = (float)v, a.TopP);
+                SetIfNotNull(v => result.Contextualai.MaxNewTokens = v, a.MaxNewTokens);
+                SetIfNotNull(v => result.Contextualai.AvoidCommentary = v, a.AvoidCommentary);
+                break;
             default:
                 throw new NotSupportedException(
                     $"Unknown generative provider type: {provider.GetType().Name}"

src/Weaviate.Client/gRPC/proto/v1/generative.proto

@@ -13,9 +13,9 @@ message GenerativeSearch {
     string prompt = 1;
     bool debug = 2;
     // only allow one at the beginning, but multiple in the future
-    repeated GenerativeProvider queries = 3;  
+    repeated GenerativeProvider queries = 3;
   }
-  
+
   message Grouped {
     string task = 1;
     optional TextArray properties = 2;
@@ -47,6 +47,7 @@ message GenerativeProvider {
     GenerativeFriendliAI friendliai = 12;
     GenerativeNvidia nvidia = 13;
     GenerativeXAI xai = 14;
+    GenerativeContextualAI contextualai = 15;
   }
 }
 
@@ -205,6 +206,16 @@ message GenerativeXAI{
   optional TextArray image_properties = 7;
 }
 
+message GenerativeContextualAI{
+  optional string model = 1;
+  optional double temperature = 2;
+  optional double top_p = 3;
+  optional int64 max_new_tokens = 4;
+  optional string system_prompt = 5;
+  optional bool avoid_commentary = 6;
+  optional TextArray knowledge = 7;
+}
+
 message GenerativeAnthropicMetadata {
   message Usage {
     int64 input_tokens = 1;