DYN-7400 : register host data marshaler (#6)

* register host data marshaler

* adapt to 3.4

Author: zavub

DSPythonNet3/DSPythonNet3.csproj

@@ -16,8 +16,8 @@
 		<NoWarn>MSB3539;CS1591;NUnit2005;NUnit2007;CS0618;CS0612;CS0672</NoWarn>
 	</PropertyGroup>
 	<ItemGroup>
-		<PackageReference Include="DynamoVisualProgramming.Core" Version="3.3.0-beta6171" ExcludeAssets="runtime" />
-		<PackageReference Include="DynamoVisualProgramming.DynamoServices" Version="3.3.0-beta6171" ExcludeAssets="runtime" />
+		<PackageReference Include="DynamoVisualProgramming.Core" Version="3.4.0-beta6616" ExcludeAssets="runtime" />
+		<PackageReference Include="DynamoVisualProgramming.DynamoServices" Version="3.4.0-beta6616" ExcludeAssets="runtime" />
     <PackageReference Include="pythonnet" Version="3.1.0-preview-ADSK-*" />
 	</ItemGroup>
 	<ItemGroup>

DSPythonNet3/DSPythonNet3Evaluator.cs

@@ -457,6 +457,46 @@ private static string GetTraceBack(Exception e)
 
         #region Marshalling
 
+        /// <summary>
+        /// Add additional data marshalers to handle host data.
+        /// </summary>
+        [SupressImportIntoVM]
+        internal override void RegisterHostDataMarshalers()
+        {
+            DataMarshaler dataMarshalerToUse = HostDataMarshaler as DataMarshaler;
+            dataMarshalerToUse?.RegisterMarshaler((PyObject pyObj) =>
+            {
+                try
+                {
+                    using (Py.GIL())
+                    {
+                        if (PyDict.IsDictType(pyObj))
+                        {
+                            using (var pyDict = new PyDict(pyObj))
+                            {
+                                var dict = new PyDict();
+                                foreach (PyObject item in pyDict.Items())
+                                {
+                                    dict.SetItem(
+                                        ConverterExtension.ToPython(dataMarshalerToUse.Marshal(item.GetItem(0))),
+                                        ConverterExtension.ToPython(dataMarshalerToUse.Marshal(item.GetItem(1)))
+                                    );
+                                }
+                                return dict;
+                            }
+                        }
+                        var unmarshalled = pyObj.AsManagedObject(typeof(object));
+                        return dataMarshalerToUse.Marshal(unmarshalled);
+                    }
+                }
+                catch (Exception e)
+                {
+                    DynamoLogger?.Log($"error marshaling python object {pyObj.Handle} {e.Message}");
+                    return pyObj;
+                }
+            });
+        }
+
         /// <summary>
         ///     Data Marshaler for all data coming into a Python node.
         /// </summary>

DynamoPythonNet3Extension/DSPythonNet3Extension.csproj

@@ -9,11 +9,11 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="DynamoVisualProgramming.Core" Version="3.3.0-beta6171">
+    <PackageReference Include="DynamoVisualProgramming.Core" Version="3.4.0-beta6616">
       <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets></ExcludeAssets>
     </PackageReference>
-    <PackageReference Include="DynamoVisualProgramming.DynamoServices" Version="3.3.0-beta6171">
+    <PackageReference Include="DynamoVisualProgramming.DynamoServices" Version="3.4.0-beta6616">
 		   <PrivateAssets>all</PrivateAssets>
       <ExcludeAssets></ExcludeAssets>
 		</PackageReference>