Handle null python traceback on clr bubbled exception (#77)

* Minor fix for null python traceback on clr bubbled exception

* Fix and add unit test

* Minor change

* Bump version to 2.0.24

Author: jhonabreul

src/embed_tests/TestPythonException.cs

@@ -265,12 +265,81 @@ def CallThrow(self):
             }
         }
 
+        [Test]
+        public void TestGetsPythonCodeInfoInStackTraceForNestedInterop()
+        {
+            using (Py.GIL())
+            {
+                dynamic testClassModule = PyModule.FromString("TestGetsPythonCodeInfoInStackTraceForNestedInterop_Module", @"
+from clr import AddReference
+AddReference(""Python.EmbeddingTest"")
+AddReference(""System"")
+
+from Python.EmbeddingTest import *
+from System import Action
+
+class TestPythonClass(TestPythonException.TestClass):
+    def CallThrow(self):
+        super().ThrowExceptionNested()
+
+def GetThrowAction():
+    return Action(CallThrow)
+
+def CallThrow():
+    TestPythonClass().CallThrow()
+");
+
+                try
+                {
+                    var action = testClassModule.GetThrowAction();
+                    action();
+                }
+                catch (ClrBubbledException ex)
+                {
+                    Assert.AreEqual("Test Exception Message", ex.InnerException.Message);
+
+                    var pythonTracebackLines = ex.PythonTraceback.TrimEnd('\n').Split('\n').Select(x => x.Trim()).ToList();
+                    Assert.AreEqual(4, pythonTracebackLines.Count);
+
+                    Assert.IsTrue(new[]
+                    {
+                        "File ",
+                        "fixtures\\PyImportTest\\SampleScript.py",
+                        "line 5",
+                        "in invokeMethodImpl"
+                    }.All(x => pythonTracebackLines[0].Contains(x)));
+                    Assert.AreEqual("getattr(instance, method_name)()", pythonTracebackLines[1]);
+
+                    Assert.IsTrue(new[]
+                    {
+                        "File ",
+                        "fixtures\\PyImportTest\\SampleScript.py",
+                        "line 2",
+                        "in invokeMethod"
+                    }.All(x => pythonTracebackLines[2].Contains(x)));
+                    Assert.AreEqual("invokeMethodImpl(instance, method_name)", pythonTracebackLines[3]);
+                }
+                catch (Exception ex)
+                {
+                    Assert.Fail($"Unexpected exception: {ex}");
+                }
+            }
+        }
+
         public class TestClass
         {
             public void ThrowException()
             {
                 throw new ArgumentException("Test Exception Message");
             }
+
+            public void ThrowExceptionNested()
+            {
+                using var _ = Py.GIL();
+
+                dynamic module = Py.Import("PyImportTest.SampleScript");
+                module.invokeMethod(this, "ThrowException");
+            }
         }
     }
 }

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.23" GeneratePathProperty="true">
+    <PackageReference Include="quantconnect.pythonnet" Version="2.0.24" GeneratePathProperty="true">
       <IncludeAssets>compile</IncludeAssets>
     </PackageReference>
   </ItemGroup>
@@ -25,7 +25,7 @@
   </Target>
 
   <Target Name="CopyBaseline" AfterTargets="Build">
-    <Copy SourceFiles="$(NuGetPackageRoot)quantconnect.pythonnet\2.0.23\lib\net5.0\Python.Runtime.dll" DestinationFolder="$(OutDir)baseline" />
+    <Copy SourceFiles="$(NuGetPackageRoot)quantconnect.pythonnet\2.0.24\lib\net5.0\Python.Runtime.dll" DestinationFolder="$(OutDir)baseline" />
   </Target>
 
   <Target Name="CopyNewBuild" AfterTargets="Build">

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.23")]
-[assembly: AssemblyFileVersion("2.0.23")]
+[assembly: AssemblyVersion("2.0.24")]
+[assembly: AssemblyFileVersion("2.0.24")]

src/runtime/Python.Runtime.csproj

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

src/runtime/PythonException.cs

@@ -1,6 +1,5 @@
 using System;
 using System.Diagnostics;
-using System.Linq;
 using System.Runtime.CompilerServices;
 using System.Runtime.ExceptionServices;
 using System.Runtime.Serialization;
@@ -185,8 +184,14 @@ private static Exception FromPyErr(BorrowedReference typeRef, BorrowedReference
                 exception = decodedException;
             }
 
-            if (!(exception is null))
+            if (exception is not null)
             {
+                // Return ClrBubbledExceptions when they are bubbled from Python -> C# -> Python -> C# -> ...
+                if (exception is ClrBubbledException)
+                {
+                    return exception;
+                }
+
                 using var _ = new Py.GILState();
                 return new ClrBubbledException(exception, TracebackToString(traceback));
             }