Fix non generic method overload resolution (#113)

* Fix non generic method overload resolution

* Add test case

* Bump version to 2.0.53

* Bump version to 2.0.53

Author: jhonabreul

src/embed_tests/TestMethodBinder.cs

@@ -1402,6 +1402,35 @@ def call_method_with_enum():
             Assert.AreEqual(DayOfWeek.Monday, CSharpModel.ProvidedArgument);
         }
 
+        [TestCase("call_non_generic_method", "GenericOverloadTestMethod")]
+        [TestCase("call_generic_method", "GenericOverloadTestMethod<T>")]
+        [TestCase("call_generic_class_method", "GenericOverloadTestClass<T>.GenericOverloadTestMethod")]
+        public void ResolvesToGenericOnlyWhenExplicitlyCalled(string pythonFuncToCall, string expectedMethodCalled)
+        {
+            using var _ = Py.GIL();
+
+            var module = PyModule.FromString($"ResolvesToGenericOnlyWhenExplicitlyCalled_{pythonFuncToCall}", @$"
+from clr import AddReference
+AddReference(""System"")
+from Python.EmbeddingTest import *
+
+def call_non_generic_method():
+    return TestMethodBinder.CSharpModel.GenericOverloadTestMethod(TestMethodBinder.CSharpModel(), 'Test')
+
+def call_generic_method():
+    return TestMethodBinder.CSharpModel.GenericOverloadTestMethod[TestMethodBinder.CSharpModel](TestMethodBinder.CSharpModel(), 'Test')
+
+def call_generic_class_method():
+    return GenericOverloadTestClass[TestMethodBinder.CSharpModel].GenericOverloadTestMethod(TestMethodBinder.CSharpModel(), 'Test')
+");
+
+            Assert.DoesNotThrow(() =>
+            {
+                using var result = module.GetAttr(pythonFuncToCall).Invoke();
+            });
+            Assert.AreEqual(expectedMethodCalled, CSharpModel.LastFuncCalled);
+        }
+
         // Used to test that we match this function with Py DateTime & Date Objects
         public static int GetMonth(DateTime test)
         {
@@ -1636,6 +1665,18 @@ public static void TestAction3(CSharpModel model1, CSharpModel model2)
                 }
                 LastFuncCalled = "TestAction3";
             }
+
+            public static string GenericOverloadTestMethod(CSharpModel testArg1, string testArg2, decimal testArgs3 = 0m)
+            {
+                LastFuncCalled = "GenericOverloadTestMethod";
+                return string.Empty;
+            }
+
+            public static T GenericOverloadTestMethod<T>(CSharpModel testArg1, string testArg2, decimal testArgs3 = 0m)
+            {
+                LastFuncCalled = "GenericOverloadTestMethod<T>";
+                return default;
+            }
         }
 
         public class TestImplicitConversion
@@ -1784,4 +1825,14 @@ public enum SomeEnu
             B = 2,
         }
     }
+
+    public class GenericOverloadTestClass<T>
+    {
+        public static T GenericOverloadTestMethod(T testArg1, string testArg2, decimal testArgs3 = 0m)
+        {
+            TestMethodBinder.CSharpModel.LastFuncCalled = "GenericOverloadTestClass<T>.GenericOverloadTestMethod";
+            return default;
+
+        }
+    }
 }

src/perf_tests/Python.PerformanceTests.csproj

@@ -13,7 +13,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
     </PackageReference>
     <PackageReference Include="Microsoft.NET.Test.Sdk" Version="16.*" />
-    <PackageReference Include="quantconnect.pythonnet" Version="2.0.52" GeneratePathProperty="true">
+    <PackageReference Include="quantconnect.pythonnet" Version="2.0.53" GeneratePathProperty="true">
       <IncludeAssets>compile</IncludeAssets>
     </PackageReference>
   </ItemGroup>
@@ -25,7 +25,7 @@
   </Target>
 
   <Target Name="CopyBaseline" AfterTargets="Build">
-    <Copy SourceFiles="$(NuGetPackageRoot)quantconnect.pythonnet\2.0.52\lib\net10.0\Python.Runtime.dll" DestinationFolder="$(OutDir)baseline" />
+    <Copy SourceFiles="$(NuGetPackageRoot)quantconnect.pythonnet\2.0.53\lib\net10.0\Python.Runtime.dll" DestinationFolder="$(OutDir)baseline" />
   </Target>
 
   <Target Name="CopyNewBuild" AfterTargets="Build">

src/runtime/MethodBinder.cs

@@ -780,13 +780,11 @@ internal Binding Bind(BorrowedReference inst, BorrowedReference args, BorrowedRe
                 else
                 {
                     bestMatch = matchesTouse
-                        .GroupBy(x => x.KwargsMatched)
-                        .OrderByDescending(x => x.Key)
-                        .First()
-                        .GroupBy(x => x.ImplicitOperations)
-                        .OrderBy(x => x.Key)
-                        .First()
-                        .MinBy(x => GetMatchedArgumentsPrecedence(x.MethodInformation, pyArgCount, kwArgDict?.Keys));
+                        .OrderBy(x => x.Method.IsGenericMethod)
+                        .ThenByDescending(x => x.KwargsMatched)
+                        .ThenBy(x => x.ImplicitOperations)
+                        .ThenBy(x => GetMatchedArgumentsPrecedence(x.MethodInformation, pyArgCount, kwArgDict?.Keys))
+                        .First();
                 }
 
                 var margs = bestMatch.ManagedArgs;

src/runtime/Properties/AssemblyInfo.cs

@@ -4,5 +4,5 @@
 [assembly: InternalsVisibleTo("Python.EmbeddingTest, PublicKey=00240000048000009400000006020000002400005253413100040000110000005ffd8f49fb44ab0641b3fd8d55e749f716e6dd901032295db641eb98ee46063cbe0d4a1d121ef0bc2af95f8a7438d7a80a3531316e6b75c2dae92fb05a99f03bf7e0c03980e1c3cfb74ba690aca2f3339ef329313bcc5dccced125a4ffdc4531dcef914602cd5878dc5fbb4d4c73ddfbc133f840231343e013762884d6143189")]
 [assembly: InternalsVisibleTo("Python.Test, PublicKey=00240000048000009400000006020000002400005253413100040000110000005ffd8f49fb44ab0641b3fd8d55e749f716e6dd901032295db641eb98ee46063cbe0d4a1d121ef0bc2af95f8a7438d7a80a3531316e6b75c2dae92fb05a99f03bf7e0c03980e1c3cfb74ba690aca2f3339ef329313bcc5dccced125a4ffdc4531dcef914602cd5878dc5fbb4d4c73ddfbc133f840231343e013762884d6143189")]
 
-[assembly: AssemblyVersion("2.0.52")]
-[assembly: AssemblyFileVersion("2.0.52")]
+[assembly: AssemblyVersion("2.0.53")]
+[assembly: AssemblyFileVersion("2.0.53")]

src/runtime/Python.Runtime.csproj

@@ -5,7 +5,7 @@
     <RootNamespace>Python.Runtime</RootNamespace>
     <AssemblyName>Python.Runtime</AssemblyName>
     <PackageId>QuantConnect.pythonnet</PackageId>
-    <Version>2.0.52</Version>
+    <Version>2.0.53</Version>
     <GenerateAssemblyInfo>false</GenerateAssemblyInfo>
     <PackageLicenseFile>LICENSE</PackageLicenseFile>
     <RepositoryUrl>https://github.com/pythonnet/pythonnet</RepositoryUrl>