Merge pull request #136 from Point72/tkp/sc

Allow inheritance from callablegeneric type

Author: timkpaine

ccflow/callable.py

@@ -556,6 +556,8 @@ def _validate_callable_model_generic_type(cls, m, handler, info):
 
         if isinstance(m, str):
             m = resolve_str(m)
+        if isinstance(m, dict):
+            m = handler(m)
         # Raise ValueError (not TypeError) as per https://docs.pydantic.dev/latest/errors/errors/
         if not isinstance(m, CallableModel):
             raise ValueError(f"{m} is not a CallableModel: {type(m)}")

ccflow/tests/test_callable.py

@@ -9,6 +9,7 @@
     ContextBase,
     ContextType,
     Flow,
+    GenericResult,
     GraphDepList,
     MetaData,
     ModelRegistry,
@@ -316,6 +317,16 @@ def test_wrapper_reference(self):
         self.assertEqual(w.context_type, m.context_type)
         self.assertEqual(w.result_type, m.result_type)
 
+    def test_override_in_subclass(self):
+        class MyCallable(CallableModelGenericType[NullContext, GenericResult]):
+            @Flow.call
+            def __call__(self, context: NullContext) -> GenericResult[int]:
+                return GenericResult[int](value=42)
+
+        m = MyCallable()
+        self.assertEqual(m.context_type, NullContext)
+        self.assertEqual(m.result_type, GenericResult[int])
+
 
 class TestCallableModelDeps(TestCase):
     def test_basic(self):