Update meta object str, repr, and pprint implementations

Author: brandonwillard

symbolic_pymc/meta.py

@@ -259,27 +259,31 @@ def __hash__(self):
         return hash((self.base, self.rands()))
 
     def __str__(self):
-        obj = getattr(self, "obj", None)
-        if obj is None:
-            res = self.__repr__()
+        return self.__repr__(show_obj=False, _repr=str)
+
+    def __repr__(self, show_obj=True, _repr=meta_repr.repr):
+        rands = self.rands()
+
+        if rands:
+            args = _repr(self.rands())[1:-1]
         else:
-            res = f"{self.__class__.__name__}({str(obj)})"
-        return res
+            args = ""
 
-    def __repr__(self):
         obj = getattr(self, "obj", None)
-        args = meta_repr.repr(self.rands()).strip("()")
-        if args:
-            args += ", "
-        args += f"obj={meta_repr.repr(obj)}"
+
+        if (show_obj and obj is not None) or not args:
+            if args:
+                args += ", "
+            args += f"obj={_repr(obj)}"
+
         return "{}({})".format(self.__class__.__name__, args)
 
     def _repr_pretty_(self, p, cycle):
         if cycle:
             p.text(f"{self.__class__.__name__}(...)")
         else:
             with p.group(2, f"{self.__class__.__name__}(", ")"):
-                p.breakable()
+                p.breakable(sep="")
                 idx = None
                 if hasattr(self, "__all_props__"):
                     for idx, (name, item) in enumerate(zip(self.__all_props__, self.rands())):

symbolic_pymc/tensorflow/meta.py

@@ -345,7 +345,12 @@ def __str__(self):
         return f"{self.__class__.__name__}({self.obj.name})"
 
     def _repr_pretty_(self, p, cycle):
-        return p.text(f"{self.__class__.__name__}({self.obj.name})")
+        if cycle:
+            p.text(f"{self.__class__.__name__}(...)")
+        else:
+            with p.group(2, f"{self.__class__.__name__}(", ")"):
+                p.breakable(sep="")
+                p.text(self.obj.name)
 
     def __eq__(self, other):
         if self is other:

symbolic_pymc/theano/meta.py

@@ -212,7 +212,12 @@ def __str__(self):
         return f"{self.__class__.__name__}({self.obj})"
 
     def _repr_pretty_(self, p, cycle):
-        return p.text(f"{self.__class__.__name__}({self.obj})")
+        if cycle:
+            p.text(f"{self.__class__.__name__}(...)")
+        else:
+            with p.group(2, f"{self.__class__.__name__}(", ")"):
+                p.breakable(sep="")
+                p.text(getattr(self.obj, "name", str(self.obj)))
 
 
 class TheanoMetaElemwise(TheanoMetaOp):

tests/test_meta.py

@@ -116,16 +116,18 @@ def test_meta_str():
 
     some_mt = SomeMetaSymbol()
 
-    assert repr(some_mt) == 'SomeMetaSymbol(1, 2, obj=None)'
+    assert repr(some_mt) == 'SomeMetaSymbol(1, 2)'
     assert str(some_mt) == repr(some_mt)
 
     some_mt = SomeMetaSymbol(SomeType(1, 2))
 
     assert repr(some_mt) == 'SomeMetaSymbol(1, 2, obj=SomeType(1, 2))'
-    assert str(some_mt) == 'SomeMetaSymbol(SomeType<1, 2>)'
+    assert str(some_mt) == 'SomeMetaSymbol(1, 2)'
 
-    some_op_mt = SomeMetaOp(SomeOp())
+    some_op_mt = SomeMetaOp()
+    assert repr(some_op_mt) == 'SomeMetaOp(obj=None)'
 
+    some_op_mt = SomeMetaOp(SomeOp())
     assert repr(some_op_mt) == 'SomeMetaOp(obj=<SomeOp>)'
 
 
@@ -135,20 +137,20 @@ def test_meta_pretty():
 
     some_mt = SomeMetaSymbol()
 
-    assert pretty_mod.pretty(some_mt) == 'SomeMetaSymbol( field1=1, field2=2)'
+    assert pretty_mod.pretty(some_mt) == 'SomeMetaSymbol(field1=1, field2=2)'
 
     meta_repr.print_obj = True
 
-    assert pretty_mod.pretty(some_mt) == 'SomeMetaSymbol( field1=1, field2=2)'
+    assert pretty_mod.pretty(some_mt) == 'SomeMetaSymbol(field1=1, field2=2)'
 
     some_mt = SomeMetaSymbol(SomeType(1, 2))
 
-    assert pretty_mod.pretty(some_mt) == 'SomeMetaSymbol( field1=1, field2=2, obj=SomeType(1, 2))'
+    assert pretty_mod.pretty(some_mt) == 'SomeMetaSymbol(field1=1, field2=2, obj=SomeType(1, 2))'
 
     meta_repr.print_obj = False
 
     some_mt = SomeMetaSymbol(SomeType(1, 2))
     some_mt.field1 = SomeMetaSymbol(SomeType(3, 4))
     some_mt.field1.field2 = SomeMetaSymbol(SomeType(5, 6))
 
-    assert pretty_mod.pretty(some_mt) == 'SomeMetaSymbol(\n  field1=SomeMetaSymbol( field1=1, field2=SomeMetaSymbol( field1=1, field2=2)),\n  field2=2)'
+    assert pretty_mod.pretty(some_mt) == 'SomeMetaSymbol(\n  field1=SomeMetaSymbol(field1=1, field2=SomeMetaSymbol(field1=1, field2=2)),\n  field2=2)'