Merge pull request #73 from jhonabreul/bug-python-exceptions-dynamic-objects

Throw C# exceptions as Python exceptions in dynamic objects

Author: Martin-Molinero

src/embed_tests/TestPropertyAccess.cs

@@ -1247,6 +1247,37 @@ def InvokeModel(self):
                 $"Elapsed: {stopwatch.Elapsed.TotalMilliseconds}ms for {iterations} iterations. {thousandInvocationsPerSecond} KIPS");
         }
 
+        [TestCaseSource(nameof(DynamicPropertiesGetterTestCases))]
+        public void TestGetPublicDynamicObjectPropertyCanCatchException(object property)
+        {
+            dynamic model = PyModule.FromString("module", @"
+from clr import AddReference
+AddReference(""Python.EmbeddingTest"")
+AddReference(""System"")
+
+from Python.EmbeddingTest import *
+
+class TestGetPublicDynamicObjectPropertyThrowsPythonException:
+    def CallDynamicMethodWithoutCatchingExceptions(self, fixture):
+        return fixture.DynamicMethod()
+
+    def CallDynamicMethodCatchingExceptions(self, fixture, defaultValue):
+        try:
+            return fixture.DynamicMethod()
+        except:
+            return defaultValue
+").GetAttr("TestGetPublicDynamicObjectPropertyThrowsPythonException").Invoke();
+
+            dynamic fixture = new DynamicFixture();
+            fixture.DynamicMethod = new Func<string>(() => throw new ArgumentException("Test"));
+
+            using (Py.GIL())
+            {
+                Assert.Throws<ArgumentException>(() => model.CallDynamicMethodWithoutCatchingExceptions(fixture));
+                Assert.AreEqual(property, model.CallDynamicMethodCatchingExceptions(fixture, property).AsManagedObject(property.GetType()));
+            }
+        }
+
         public interface IModel
         {
             void InvokeModel();

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.19" GeneratePathProperty="true">
+    <PackageReference Include="quantconnect.pythonnet" Version="2.0.20" GeneratePathProperty="true">
       <IncludeAssets>compile</IncludeAssets>
     </PackageReference>
   </ItemGroup>
@@ -25,7 +25,7 @@
   </Target>
 
   <Target Name="CopyBaseline" AfterTargets="Build">
-    <Copy SourceFiles="$(NuGetPackageRoot)quantconnect.pythonnet\2.0.19\lib\net5.0\Python.Runtime.dll" DestinationFolder="$(OutDir)baseline" />
+    <Copy SourceFiles="$(NuGetPackageRoot)quantconnect.pythonnet\2.0.20\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.19")]
-[assembly: AssemblyFileVersion("2.0.19")]
+[assembly: AssemblyVersion("2.0.20")]
+[assembly: AssemblyFileVersion("2.0.20")]

src/runtime/Python.Runtime.csproj

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

src/runtime/Types/DynamicClassObject.cs

@@ -86,6 +86,12 @@ public static NewReference tp_getattro(BorrowedReference ob, BorrowedReference k
                 {
                     // Do nothing, AttributeError was already raised in Python side and it was not cleared.
                 }
+                // Catch C# exceptions and raise them as Python exceptions.
+                catch(Exception exception)
+                {
+                    Exceptions.Clear();
+                    Exceptions.SetError(exception);
+                }
             }
 
             return result;
@@ -110,7 +116,15 @@ public static int tp_setattro(BorrowedReference ob, BorrowedReference key, Borro
             var value = ((CLRObject)GetManagedObject(val))?.inst ?? PyObject.FromNullableReference(val);
 
             var callsite = SetAttrCallSite(name, clrObjectType);
-            callsite.Target(callsite, clrObj.inst, value);
+            try
+            {
+                callsite.Target(callsite, clrObj.inst, value);
+            }
+            // Catch C# exceptions and raise them as Python exceptions.
+            catch (Exception exception)
+            {
+                Exceptions.SetError(exception);
+            }
 
             return 0;
         }