Add DynamicClassObject to handle c# dynamic object only

Author: jhonabreul

src/embed_tests/TestPropertyAccess.cs

@@ -927,76 +927,6 @@ def SetValue(self):
             }
         }
 
-        private static TestCaseData[] DynamicPropertiesGetterTestCases() => new[]
-        {
-            new TestCaseData(true),
-            new TestCaseData(10),
-            new TestCaseData(10.1),
-            new TestCaseData(10.2m),
-            new TestCaseData("Some string"),
-            new TestCaseData(new DateTime(2023, 6, 22)),
-            new TestCaseData(new List<int> { 1, 2, 3, 4, 5 }),
-            new TestCaseData(new Dictionary<string, int> { { "first", 1 }, { "second", 2 }, { "third", 3 } }),
-            new TestCaseData(new Fixture()),
-        };
-
-        [TestCaseSource(nameof(DynamicPropertiesGetterTestCases))]
-        public void TestGetPublicDynamicObjectPropertyWorks(object property)
-        {
-            dynamic model = PyModule.FromString("module", @"
-from clr import AddReference
-AddReference(""Python.EmbeddingTest"")
-AddReference(""System"")
-
-from Python.EmbeddingTest import *
-
-class TestGetPublicDynamicObjectPropertyWorks:
-    def GetValue(self, fixture):
-        return fixture.SomeProperty
-").GetAttr("TestGetPublicDynamicObjectPropertyWorks").Invoke();
-
-            dynamic fixture = new DynamicFixture();
-            fixture.SomeProperty = property;
-
-            using (Py.GIL())
-            {
-                Assert.AreEqual(property, (model.GetValue(fixture) as PyObject).AsManagedObject(property.GetType()));
-            }
-        }
-
-        [Test]
-        public void TestGetNonExistingPublicDynamicObjectPropertyThrows()
-        {
-            dynamic model = PyModule.FromString("module", @"
-from clr import AddReference
-AddReference(""Python.EmbeddingTest"")
-AddReference(""System"")
-
-from Python.EmbeddingTest import *
-
-class TestGetNonExistingPublicDynamicObjectPropertyThrows:
-    def GetValue(self, fixture):
-        try:
-            prop = fixture.AnotherProperty
-        except AttributeError as e:
-            return e
-
-        return None
-").GetAttr("TestGetNonExistingPublicDynamicObjectPropertyThrows").Invoke();
-
-            dynamic fixture = new DynamicFixture();
-            fixture.SomeProperty = "Some property";
-
-            using (Py.GIL())
-            {
-                var result = model.GetValue(fixture) as PyObject;
-                Assert.IsFalse(result.IsNone());
-                Assert.AreEqual(result.PyType, Exceptions.AttributeError);
-                Assert.AreEqual("'Python.EmbeddingTest.TestPropertyAccess+DynamicFixture' object has no attribute 'AnotherProperty'",
-                    result.ToString());
-            }
-        }
-
         public class DynamicFixture : DynamicObject
         {
             private Dictionary<string, object> _properties = new Dictionary<string, object>();
@@ -1026,6 +956,10 @@ public override bool TryInvokeMember(InvokeMemberBinder binder, object[] args, o
                     return false;
                 }
             }
+
+            public Dictionary<string, object> Properties { get { return _properties; } }
+
+            public string NonDynamicProperty { get; set; }
         }
 
         public class TestPerson : IComparable, IComparable<TestPerson>
@@ -1064,6 +998,76 @@ public bool Equals(TestPerson other)
             }
         }
 
+        private static TestCaseData[] DynamicPropertiesGetterTestCases() => new[]
+        {
+            new TestCaseData(true),
+            new TestCaseData(10),
+            new TestCaseData(10.1),
+            new TestCaseData(10.2m),
+            new TestCaseData("Some string"),
+            new TestCaseData(new DateTime(2023, 6, 22)),
+            new TestCaseData(new List<int> { 1, 2, 3, 4, 5 }),
+            new TestCaseData(new Dictionary<string, int> { { "first", 1 }, { "second", 2 }, { "third", 3 } }),
+            new TestCaseData(new Fixture()),
+        };
+
+        [TestCaseSource(nameof(DynamicPropertiesGetterTestCases))]
+        public void TestGetPublicDynamicObjectPropertyWorks(object property)
+        {
+            dynamic model = PyModule.FromString("module", @"
+from clr import AddReference
+AddReference(""Python.EmbeddingTest"")
+AddReference(""System"")
+
+from Python.EmbeddingTest import *
+
+class TestGetPublicDynamicObjectPropertyWorks:
+    def GetValue(self, fixture):
+        return fixture.DynamicProperty
+").GetAttr("TestGetPublicDynamicObjectPropertyWorks").Invoke();
+
+            dynamic fixture = new DynamicFixture();
+            fixture.DynamicProperty = property;
+
+            using (Py.GIL())
+            {
+                Assert.AreEqual(property, (model.GetValue(fixture) as PyObject).AsManagedObject(property.GetType()));
+            }
+        }
+
+        [Test]
+        public void TestGetNonExistingPublicDynamicObjectPropertyThrows()
+        {
+            dynamic model = PyModule.FromString("module", @"
+from clr import AddReference
+AddReference(""Python.EmbeddingTest"")
+AddReference(""System"")
+
+from Python.EmbeddingTest import *
+
+class TestGetNonExistingPublicDynamicObjectPropertyThrows:
+    def GetValue(self, fixture):
+        try:
+            prop = fixture.AnotherProperty
+        except AttributeError as e:
+            return e
+
+        return None
+").GetAttr("TestGetNonExistingPublicDynamicObjectPropertyThrows").Invoke();
+
+            dynamic fixture = new DynamicFixture();
+            fixture.DynamicProperty = "Dynamic property";
+
+            using (Py.GIL())
+            {
+                var result = model.GetValue(fixture) as PyObject;
+                Assert.IsFalse(result.IsNone());
+                Assert.AreEqual(result.PyType, Exceptions.AttributeError);
+                Assert.AreEqual("'Python.EmbeddingTest.TestPropertyAccess+DynamicFixture' object has no attribute 'AnotherProperty'",
+                    result.ToString());
+            }
+        }
+
         private static TestCaseData[] DynamicPropertiesSetterTestCases() => new[]
         {
             new TestCaseData("True", null),
@@ -1093,7 +1097,7 @@ from Python.EmbeddingTest import *
 
 class TestGetPublicDynamicObjectPropertyWorks:
     def SetValue(self, fixture):
-        fixture.SomeProperty = value
+        fixture.DynamicProperty = value
 
     def GetPythonValue(self):
         return value
@@ -1107,7 +1111,36 @@ def GetPythonValue(self):
                 var expectedAsPyObject = model.GetPythonValue() as PyObject;
                 var expected = expectedType != null ? expectedAsPyObject.AsManagedObject(expectedType) : expectedAsPyObject;
 
-                Assert.AreEqual(expected, fixture.SomeProperty);
+                Assert.AreEqual(expected, fixture.DynamicProperty);
+            }
+        }
+
+        [Test]
+        public void TestSetPublicNonDynamicObjectPropertyToActualPropertyWorks()
+        {
+            var expected = "Non Dynamic Property";
+            dynamic model = PyModule.FromString("module", $@"
+from clr import AddReference
+AddReference(""Python.EmbeddingTest"")
+AddReference(""System"")
+
+from datetime import datetime
+import System
+from Python.EmbeddingTest import *
+
+class TestGetPublicDynamicObjectPropertyWorks:
+    def SetValue(self, fixture):
+        fixture.NonDynamicProperty = ""{expected}""
+").GetAttr("TestGetPublicDynamicObjectPropertyWorks").Invoke();
+
+            var fixture = new DynamicFixture();
+
+            using (Py.GIL())
+            {
+                model.SetValue(fixture);
+                Assert.AreEqual(expected, fixture.NonDynamicProperty);
+                Assert.AreEqual(expected, ((dynamic)fixture).NonDynamicProperty);
+                Assert.IsFalse(fixture.Properties.ContainsKey(nameof(fixture.NonDynamicProperty)));
             }
         }
 

src/runtime/ClassManager.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Dynamic;
 using System.Linq;
 using System.Reflection;
 using System.Runtime.InteropServices;
@@ -183,6 +184,11 @@ internal static ClassBase CreateClass(Type type)
                 impl = new KeyValuePairEnumerableObject(type);
             }
 
+            else if (typeof(IDynamicMetaObjectProvider).IsAssignableFrom(type))
+            {
+                impl = new DynamicClassObject(type);
+            }
+
             else if (type.IsInterface)
             {
                 impl = new InterfaceObject(type);
@@ -221,7 +227,7 @@ internal static void InitClassBase(Type type, ClassBase impl, ReflectedClrType p
             impl.indexer = info.indexer;
             impl.richcompare.Clear();
 
-            
+
             // Finally, initialize the class __dict__ and return the object.
             using var newDict = Runtime.PyObject_GenericGetDict(pyType.Reference);
             BorrowedReference dict = newDict.Borrow();

src/runtime/Types/ClassObject.cs

@@ -1,11 +1,8 @@
 using System;
 using System.Diagnostics;
-using System.Dynamic;
 using System.Linq;
 using System.Reflection;
-using System.Runtime.CompilerServices;
 using System.Runtime.Serialization;
-using RuntimeBinder = Microsoft.CSharp.RuntimeBinder;
 
 namespace Python.Runtime
 {
@@ -278,98 +275,5 @@ public override NewReference type_subscript(BorrowedReference idx)
             }
             return Exceptions.RaiseTypeError("unsubscriptable object");
         }
-
-        /// <summary>
-        /// Type __getattro__ implementation.
-        /// </summary>
-        public static NewReference tp_getattro(BorrowedReference ob, BorrowedReference key)
-        {
-
-            if (!Runtime.PyString_Check(key))
-            {
-                return Exceptions.RaiseTypeError("string expected");
-            }
-
-            var result = Runtime.PyObject_GenericGetAttr(ob, key);
-
-            // Property not found, but it can still be a dynamic one if the object is an IDynamicMetaObjectProvider
-            if (result.IsNull())
-            {
-                var clrObj = (CLRObject)GetManagedObject(ob)!;
-                if (clrObj?.inst is IDynamicMetaObjectProvider)
-                {
-
-                    // The call to Runtime.PyObject_GenericGetAttr above ended up with an AttributeError
-                    // for dynamic properties since they are not found.
-                    if (Exceptions.ExceptionMatches(Exceptions.AttributeError))
-                    {
-                        Exceptions.Clear();
-                    }
-
-                    // TODO: Cache call site.
-
-                    var name = Runtime.GetManagedString(key);
-                    var binder = RuntimeBinder.Binder.GetMember(
-                        RuntimeBinder.CSharpBinderFlags.None,
-                        name,
-                        clrObj.inst.GetType(),
-                        new[] { RuntimeBinder.CSharpArgumentInfo.Create(RuntimeBinder.CSharpArgumentInfoFlags.None, null) });
-                    var callsite = CallSite<Func<CallSite, object, object>>.Create(binder);
-
-                    try
-                    {
-                        var res = callsite.Target(callsite, clrObj.inst);
-                        return Converter.ToPython(res);
-                    }
-                    catch (RuntimeBinder.RuntimeBinderException)
-                    {
-                        Exceptions.SetError(Exceptions.AttributeError, $"'{clrObj?.inst.GetType()}' object has no attribute '{name}'");
-                    }
-                }
-            }
-
-            return result;
-        }
-
-        /// <summary>
-        /// Type __setattro__ implementation.
-        /// </summary>
-        public static int tp_setattro(BorrowedReference ob, BorrowedReference key, BorrowedReference val)
-        {
-            if (!Runtime.PyString_Check(key))
-            {
-                Exceptions.RaiseTypeError("string expected");
-                return -1;
-            }
-
-            // If the object is an IDynamicMetaObjectProvider, the property is set as a C# dynamic property, not as a Python attribute
-            var clrObj = (CLRObject)GetManagedObject(ob)!;
-            if (clrObj?.inst is IDynamicMetaObjectProvider)
-            {
-                // TODO: Cache call site.
-
-                var name = Runtime.GetManagedString(key);
-                var binder = RuntimeBinder.Binder.SetMember(
-                    RuntimeBinder.CSharpBinderFlags.None,
-                    name,
-                    clrObj.inst.GetType(),
-                    new[]
-                    {
-                        RuntimeBinder.CSharpArgumentInfo.Create(RuntimeBinder.CSharpArgumentInfoFlags.None, null),
-                        RuntimeBinder.CSharpArgumentInfo.Create(RuntimeBinder.CSharpArgumentInfoFlags.None, null)
-                    });
-                var callsite = CallSite<Func<CallSite, object, object, object>>.Create(binder);
-
-                var value = ((CLRObject)GetManagedObject(val))?.inst ?? PyObject.FromNullableReference(val);
-                callsite.Target(callsite, clrObj.inst, value);
-
-                return 0;
-            }
-
-            int res = Runtime.PyObject_GenericSetAttr(ob, key, val);
-            Runtime.PyType_Modified(ob);
-
-            return res;
-        }
     }
 }