Merge branch 'sourceOpType' into dev

Author: raganmd

TouchDesigner/project.toe

@@ -16,7 +16,12 @@ def check_active(self) -> bool:
 
     def LogError(self, message: str, absFrame: int, severity: int, type, source: callable):
         error: scryEntities.scryError = scryEntities.scryError(
-            message=message, severity=severity, opType=type, source=source.path, absFrame=absFrame)
+            message=message,
+            severity=severity,
+            opType=type,
+            source=source.path,
+            sourceOpType=source.type,
+            absFrame=absFrame)
 
         # NOTE check if ws is currently active before attempting to send
         if self.check_active():

TouchDesigner/td-python/scry.py

@@ -74,6 +74,7 @@ def __init__(
             self,
             message: str,
             source: str,
+            sourceOpType: str,
             absFrame: int,
             severity: int,
             opType: scryErrorOpType):
@@ -85,6 +86,7 @@ def __init__(
             severity=scryErrorLevel(severity),
             msgType=scryMsgType.error)
 
+        self.sourceOpType = sourceOpType
         self.opType = scryErrorOpType(opType)
 
     def __repr__(self) -> str:
@@ -93,7 +95,8 @@ def __repr__(self) -> str:
     @property
     def toDict(self) -> dict:
         dataAsDict: dict = self._toDict
-        dataAsDict["opType"] = self.opType.name
+        dataAsDict['opType'] = self.opType.name
+        dataAsDict['sourceOpType'] = self.sourceOpType
 
         return dataAsDict