sync with master

Author: NRHelmi

README.md

@@ -2,7 +2,7 @@
 
 This is a Client SDK for RelationalAI
 
-- API version: 1.2.3
+- API version: 1.2.4
 
 ## Frameworks supported
 

RelationalAI/Connection.cs

@@ -17,6 +17,7 @@ public abstract class Connection
         public const bool DEFAULT_VERIFY_SSL = true;
         public const int DEFAULT_DEBUG_LEVEL = 0;
         public const int DEFAULT_CONNECTION_TIMEOUT = 300; // seconds
+        public const IDictionary<String, String> DEFAULT_EXTRA_HEADERS = null;
 
         public virtual string DbName => throw new InvalidOperationException();
 
@@ -46,6 +47,8 @@ public Uri BaseUrl {
 
         public int ConnectionTimeout { get; set; }
 
+        public IDictionary<String, String> ExtraHeaders { get; set; }
+
         public KGMSClient Client { get; set; }
         public ManagementClient CloudClient { get; set; }
 
@@ -79,7 +82,8 @@ public LocalConnection(
             string scheme = DEFAULT_SCHEME,
             string host = DEFAULT_HOST,
             int port = DEFAULT_PORT,
-            int connectionTimeout = DEFAULT_CONNECTION_TIMEOUT
+            int connectionTimeout = DEFAULT_CONNECTION_TIMEOUT,
+            IDictionary<String, String> extraHeaders = DEFAULT_EXTRA_HEADERS
         )
         {
             this.DbName = dbname;
@@ -88,6 +92,7 @@ public LocalConnection(
             this.Host = host;
             this.Port = port;
             this.ConnectionTimeout = connectionTimeout;
+            this.ExtraHeaders = extraHeaders == null ? new Dictionary<String, String>() : extraHeaders;
 
             if(this.GetType() == typeof(LocalConnection))
             {

RelationalAI/KGMSClient.cs

@@ -21,7 +21,7 @@ public partial class GeneratedRelationalAIClient
 
         public const string JSON_CONTENT_TYPE = "application/json";
         public const string CSV_CONTENT_TYPE = "text/csv";
-        public const string USER_AGENT_HEADER = "KGMSClient/1.2.3/csharp";
+        public const string USER_AGENT_HEADER = "KGMSClient/1.2.4/csharp";
 
         public int DebugLevel = Connection.DEFAULT_DEBUG_LEVEL;
 
@@ -55,10 +55,10 @@ partial void PrepareRequest(Transaction body, HttpClient client, HttpRequestMess
                 // Note:
                 // We need to send the gzip content encoding header and a gzip compressed body only in case of a CloudConnection.
                 // Local rai-server cannot handle gzip encoding, only infra server support does.
-        
-                // Compress the contents (request body) as gzipped byte array. C# httpclient does not implicitly compress the content over the wire 
+
+                // Compress the contents (request body) as gzipped byte array. C# httpclient does not implicitly compress the content over the wire
                 // if content encoding is gzip; we need to manually compress the body.
-                // Note: If the client sends content-encoding as gzip but does not encode the content to gzip, then the server will return 400 Bad Request. 
+                // Note: If the client sends content-encoding as gzip but does not encode the content to gzip, then the server will return 400 Bad Request.
                 request.Content = CompressionUtils.CompressRequestContentAsGzip(request.Content);
                 //Set the content encoding type header as gzip. It will tell the server that the content is gzip encoded.
                 request.Content.Headers.Add("content-encoding", "gzip");
@@ -70,7 +70,7 @@ partial void PrepareRequest(Transaction body, HttpClient client, HttpRequestMess
             request.Headers.Host = request.RequestUri.Host;
             //Set the content type header
             request.Content.Headers.ContentType = MediaTypeHeaderValue.Parse("application/json; charset=utf-8");
-            
+
             // Set Auth here
             var raiRequest = new RAIRequest(request, conn);
             raiRequest.SetAuth();
@@ -85,7 +85,7 @@ partial void PrepareRequest(Transaction body, HttpClient client, HttpRequestMess
                 AsyncLocalKeepAliveCancellationTokenSource.Value = tokenSource;
                 CancellationToken ct = tokenSource.Token;
 
-                /** 
+                /**
                  * TODO: currently we swallo exceptions in KeepClientAlive.
                  * If we want to throw, then we need to change this to asynchronously handle the throw
                  * e.g.
@@ -347,6 +347,7 @@ public override string ToString()
     public class KGMSClient : GeneratedRelationalAIClient
     {
         public static ILogger DefaultLogger = new ConsoleLogger();
+        public static IDictionary<String, String> extraHeaders = new Dictionary<String, String>();
 
         public ILogger Logger
         {
@@ -366,7 +367,7 @@ public override async Task KeepClientAlive(HttpClient client_, String url, Cance
                 try {
                     await Task.Run(() => this.KeepAliveProbe(client_, ct));
                 } catch (Exception e) {
-                    // ignore. But I think we might want to throw? 
+                    // ignore. But I think we might want to throw?
                     Logger.Error("KeepAliveProbe failed with exception: " + e.Message);
                 }
             }
@@ -400,6 +401,11 @@ public static void AddExtraHeaders(HttpRequestMessage request)
         {
             // host & content-type header for signature verification, more headers here
             request.Headers.UserAgent.TryParseAdd(USER_AGENT_HEADER);
+            // add extra headers
+            foreach(var item in extraHeaders)
+            {
+                request.Headers.Add(item.Key, item.Value);
+            }
         }
 
         private static bool httpClientVerifySSL = Connection.DEFAULT_VERIFY_SSL;
@@ -434,6 +440,7 @@ protected internal static HttpClient GetHttpClient(
         public KGMSClient(Connection conn) : base(KGMSClient.GetHttpClient(conn.BaseUrl, conn.VerifySSL, conn.ConnectionTimeout))
         {
             this.conn = conn;
+            extraHeaders = conn.ExtraHeaders;
             conn.Client = this;
             this.BaseUrl = conn.BaseUrl.ToString();
         }
@@ -479,23 +486,9 @@ public ActionResult RunAction(String name, Action action, out bool success, bool
             xact.Actions = new List<LabeledAction>();
             xact.Actions.Add(labeledAction);
             xact.Readonly = isReadOnly;
-            xact.Version = this.conn.Version;
 
             TransactionResult response = RunTransaction(xact);
 
-            // Sync the reported database version to our local
-            // connection version. Important, as we want to ensure
-            // that in subsequent transactions this will be the
-            // minimum required version of the database. Note that
-            // only write transactions bump the version.
-            lock(this.conn) {
-                int currentVersion = conn.Version;
-                int responseVersion = response.Version.GetValueOrDefault(0);
-                if(responseVersion > currentVersion) {
-                    conn.Version = responseVersion;
-                }
-            }
-
             success = IsSuccess(response);
             foreach (LabeledActionResult act in response.Actions)
             {
@@ -521,7 +514,6 @@ public bool CloneDatabase(string sourceDbname, bool overwrite = false)
             xact.Actions = new LinkedList<LabeledAction>();
             xact.Source_dbname = sourceDbname;
             xact.Readonly = false;
-            xact.Version = this.conn.Version;
             TransactionResult response = RunTransaction(xact);
 
             if(response.Problems.Count > 0) {
@@ -538,7 +530,6 @@ public bool CreateDatabase(bool overwrite = false)
             xact.Dbname = conn.DbName;
             xact.Actions = new LinkedList<LabeledAction>();
             xact.Readonly = false;
-            xact.Version = this.conn.Version;
 
             TransactionResult response = RunTransaction(xact);
 

RelationalAI/RelationalAI.csproj

@@ -1,7 +1,7 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Version>1.2.3</Version>
+    <Version>1.2.4</Version>
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <PackageId>RelationalAI</PackageId>
     <Authors>RelationalAI</Authors>

default.nix

@@ -9,7 +9,7 @@ let
 in
 stdenv.mkDerivation rec {
   name = "rai-server-csharp-client-sdk-${version}";
-  version = "1.2.3";
+  version = "1.2.4";
   buildInputs = [
     raiserverBinary
     dotnet-sdk_3