Revert "Fix: interface property implementation in python models (#7987)"

This reverts commit ab40b5c.
QuantConnect · May 9, 2024 · 4f340fc · 4f340fc
1 parent 53fb994
commit 4f340fc
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 67 deletions.
diff --git a/Common/Python/PythonWrapper.cs b/Common/Python/PythonWrapper.cs
@@ -46,8 +46,7 @@ public static PyObject ValidateImplementationOf<TInterface>(this PyObject model)
             {
                 foreach (var member in members)
                 {
-                    if ((member is not MethodInfo method || !method.IsSpecialName) &&
-                        !model.HasAttr(member.Name) && !model.HasAttr(member.Name.ToSnakeCase()))
+                    if (!model.HasAttr(member.Name) && !model.HasAttr(member.Name.ToSnakeCase()))
                     {
                         missingMembers.Add(member.Name);
                     }

diff --git a/Tests/Python/PythonWrapperTests.cs b/Tests/Python/PythonWrapperTests.cs
@@ -19,7 +19,6 @@
 using QuantConnect.Python;
 using System.Collections.Generic;
 using QuantConnect.Statistics;
-using System.Reflection;
 
 namespace QuantConnect.Tests.Python
 {
@@ -28,31 +27,47 @@ public static class PythonWrapperTests
         [TestFixture]
         public class ValidateImplementationOf
         {
-            [TestCase(nameof(MissingMethodOne), "ModelMissingMethodOne", "MethodOne")]
-            [TestCase(nameof(MissingProperty), "ModelMissingProperty", "PropertyOne")]
-            public void ThrowsOnMissingMember(string moduleName, string className, string missingMemberName)
+            [Test]
+            public void ThrowsOnMissingMember()
             {
                 using (Py.GIL())
                 {
-                    var moduleStr = GetFieldValue(moduleName);
-                    var module = PyModule.FromString(nameof(ValidateImplementationOf), moduleStr);
-                    var model = module.GetAttr(className).Invoke();
+                    var module = PyModule.FromString(nameof(ValidateImplementationOf), MissingMethodOne);
+                    var model = module.GetAttr("ModelMissingMethodOne");
                     Assert.That(() => model.ValidateImplementationOf<IModel>(), Throws
-                        .Exception.InstanceOf<NotImplementedException>().With.Message.Contains(missingMemberName));
+                        .Exception.InstanceOf<NotImplementedException>().With.Message.Contains("MethodOne"));
+                }
+            }
+
+            [Test]
+            public void DoesNotThrowWhenInterfaceFullyImplemented()
+            {
+                using (Py.GIL())
+                {
+                    var module = PyModule.FromString(nameof(ValidateImplementationOf), FullyImplemented);
+                    var model = module.GetAttr("FullyImplementedModel");
+                    Assert.That(() => model.ValidateImplementationOf<IModel>(), Throws.Nothing);
                 }
             }
 
-            [TestCase(nameof(FullyImplemented), "FullyImplementedModel")]
-            [TestCase(nameof(FullyImplementedSnakeCase), "FullyImplementedSnakeCaseModel")]
-            [TestCase(nameof(FullyImplementedWithPropertyAsField), "FullyImplementedModelWithPropertyAsField")]
-            [TestCase(nameof(DerivedFromCsharp), "DerivedFromCSharpModel")]
-            public void DoesNotThrowWhenInterfaceFullyImplemented(string moduleName, string className)
+            [Test]
+            public void DoesNotThrowWhenInterfaceFullyImplementedSnakeCaseStyle()
             {
                 using (Py.GIL())
                 {
-                    var moduleStr = GetFieldValue(moduleName);
-                    var module = PyModule.FromString(nameof(ValidateImplementationOf), moduleStr);
-                    var model = module.GetAttr(className).Invoke();
+                    var module = PyModule.FromString(nameof(ValidateImplementationOf), FullyImplementedSnakeCase);
+                    var model = module.GetAttr("FullyImplementedSnakeCaseModel");
+                    Assert.That(() => model.ValidateImplementationOf<IModel>(), Throws.Nothing);
+                }
+            }
+
+            [Test]
+            public void DoesNotThrowWhenDerivedFromCSharpModel()
+            {
+                using (Py.GIL())
+                {
+                    var module = PyModule.FromString(nameof(ValidateImplementationOf), DerivedFromCsharp);
+                    var model = module.GetAttr("DerivedFromCSharpModel");
                     Assert.That(() => model.ValidateImplementationOf<IModel>(), Throws.Nothing);
                 }
             }
@@ -213,11 +228,6 @@ public void PEP8StyleCustomModelsWork()
                 );
             }
 
-            private static string GetFieldValue(string name)
-            {
-                return typeof(ValidateImplementationOf).GetField(name, BindingFlags.Static | BindingFlags.NonPublic).GetValue(null) as string;
-            }
-
             private const string FullyImplemented =
                 @"
 from clr import AddReference
@@ -230,9 +240,6 @@ class FullyImplementedModel:
         pass
     def MethodTwo():
         pass
-    @property
-    def PropertyOne(self):
-        return 'value'
 
 ";
 
@@ -248,26 +255,7 @@ class FullyImplementedSnakeCaseModel:
         pass
     def method_two():
         pass
-    @property
-    def property_one(self):
-        pass
-
-";
-
-            private const string FullyImplementedWithPropertyAsField =
-                @"
-from clr import AddReference
-AddReference('QuantConnect.Tests')
-
-from QuantConnect.Tests.Python import *
 
-class FullyImplementedModelWithPropertyAsField:
-    def method_one():
-        pass
-    def method_two():
-        pass
-    def __init__(self):
-        self.property_one = 'value'
 ";
 
             private const string DerivedFromCsharp =
@@ -280,9 +268,6 @@ class FullyImplementedModelWithPropertyAsField:
 class DerivedFromCSharpModel(PythonWrapperTests.ValidateImplementationOf.Model):
     def MethodOne():
         pass
-    @property
-    def PropertyOne(self):
-        return 'value'
 
 ";
 
@@ -296,36 +281,17 @@ class DerivedFromCSharpModel(PythonWrapperTests.ValidateImplementationOf.Model):
 class ModelMissingMethodOne:
     def MethodTwo():
         pass
-    @property
-    def PropertyOne(self):
-        return 'value'
-";
 
-            private const string MissingProperty =
-                @"
-from clr import AddReference
-AddReference('QuantConnect.Tests')
-
-from QuantConnect.Tests.Python import *
-
-class ModelMissingProperty:
-    def MethodOne():
-        pass
-    def MethodTwo():
-        pass
 ";
 
             interface IModel
             {
-                string PropertyOne { get; set; }
                 void MethodOne();
                 void MethodTwo();
             }
 
             public class Model : IModel
             {
-                public string PropertyOne { get; set; }
-
                 public void MethodOne()
                 {
                 }