Don't show format of expr in repr (to match behavior of HTML repr) (p…

…ython-graphblas#303)

.pre-commit-config.yaml

@@ -16,7 +16,7 @@ repos:
       - id: mixed-line-ending
       - id: trailing-whitespace
   - repo: https://github.com/myint/autoflake
-    rev: v1.7.6
+    rev: v1.7.7
     hooks:
       - id: autoflake
         args: [--in-place]
@@ -54,7 +54,7 @@ repos:
       - id: yesqa
         additional_dependencies: *flake8_dependencies
   - repo: https://github.com/codespell-project/codespell
-    rev: v2.2.0
+    rev: v2.2.2
     hooks:
       - id: codespell
         types_or: [python, rst, markdown]

graphblas/core/formatting.py

@@ -355,24 +355,26 @@ def get_format(x, is_transposed=False):
     return fmt
 
 
-def matrix_info(matrix, *, mask=None, for_html=True):
+def matrix_info(matrix, *, mask=None, expr=None, for_html=True):
     if mask is not None:
         if for_html:
             name = f"{type(mask).__name__}\nof\ngb.{type(matrix).__name__}"
         else:
             name = [f"{type(mask).__name__}", f"of gb.{type(matrix).__name__}"]
     else:
         name = f"gb.{type(matrix).__name__}"
-    keys = ["nvals", "nrows", "ncols", "dtype", "format"]
+    keys = ["nvals", "nrows", "ncols", "dtype"]
     vals = [matrix._nvals, matrix._nrows, matrix._ncols, matrix.dtype.name]
-    if type(matrix) is Matrix:
-        vals.append(get_format(matrix))
-    else:  # TransposedMatrix
-        vals.append(get_format(matrix._matrix, is_transposed=True))
+    if expr is None:
+        keys.append("format")
+        if type(matrix) is Matrix:
+            vals.append(get_format(matrix))
+        else:  # TransposedMatrix
+            vals.append(get_format(matrix._matrix, is_transposed=True))
     return name, keys, vals
 
 
-def vector_info(vector, *, mask=None, for_html=True):
+def vector_info(vector, *, mask=None, expr=None, for_html=True):
     if mask is not None:
         if for_html:
             name = f"{type(mask).__name__}\nof\ngb.{type(vector).__name__}"
@@ -381,8 +383,11 @@ def vector_info(vector, *, mask=None, for_html=True):
     else:
         name = f"gb.{type(vector).__name__}"
     # SS, SuiteSparse-specific: format
-    keys = ["nvals", "size", "dtype", "format"]
-    vals = [vector._nvals, vector._size, vector.dtype.name, get_format(vector)]
+    keys = ["nvals", "size", "dtype"]
+    vals = [vector._nvals, vector._size, vector.dtype.name]
+    if expr is None:
+        keys.append("format")
+        vals.append(get_format(vector))
     return name, keys, vals
 
 
@@ -405,12 +410,8 @@ def matrix_header_html(matrix, *, mask=None):
 
 
 def matrix_expression_header_html(matrix, expr):
-    _, keys, vals = matrix_info(matrix, for_html=True)
+    _, keys, vals = matrix_info(matrix, expr=expr, for_html=True)
     name = expr._format_expr_html()
-    # Drop format (the last entry)
-    assert keys[-1] == "format"
-    keys = keys[:-1]
-    vals = vals[:-1]
     return create_header_html(name, keys, vals)
 
 
@@ -420,12 +421,8 @@ def vector_header_html(vector, *, mask=None):
 
 
 def vector_expression_header_html(matrix, expr):
-    _, keys, vals = vector_info(matrix, for_html=True)
+    _, keys, vals = vector_info(matrix, expr=expr, for_html=True)
     name = expr._format_expr_html()
-    # Drop format (the last entry)
-    assert keys[-1] == "format"
-    keys = keys[:-1]
-    vals = vals[:-1]
     return create_header_html(name, keys, vals)
 
 
@@ -497,7 +494,7 @@ def format_scalar_html(scalar, expr=None):
     return f'{CSS_STYLE}<div class="gb-scalar"><tt>{top_name}</tt>{header}</div>'
 
 
-def format_scalar(scalar):
+def format_scalar(scalar, expr=None):
     return create_header(
         "gb.Scalar",
         ["value", "dtype"],
@@ -519,7 +516,7 @@ def get_expr_result(expr, html=False):
         if html:
             arg_string = f"{val._repr_html_(expr=expr)}"
         else:
-            arg_string = f"{val}"
+            arg_string = val.__repr__(expr=expr)
         val.name = name
     return arg_string
 
@@ -654,8 +651,8 @@ def create_header(type_name, keys, vals, *, lower_border=False, name="", quote=T
     return "\n".join(lines)
 
 
-def format_matrix(matrix, *, max_rows=None, min_rows=None, max_columns=None, mask=None):
-    name, keys, vals = matrix_info(matrix, mask=mask, for_html=False)
+def format_matrix(matrix, *, max_rows=None, min_rows=None, max_columns=None, mask=None, expr=None):
+    name, keys, vals = matrix_info(matrix, mask=mask, expr=expr, for_html=False)
     header = create_header(
         name,
         keys,
@@ -674,8 +671,8 @@ def format_matrix(matrix, *, max_rows=None, min_rows=None, max_columns=None, mas
     return header
 
 
-def format_vector(vector, *, max_rows=None, min_rows=None, max_columns=None, mask=None):
-    name, keys, vals = vector_info(vector, mask=mask, for_html=False)
+def format_vector(vector, *, max_rows=None, min_rows=None, max_columns=None, mask=None, expr=None):
+    name, keys, vals = vector_info(vector, mask=mask, expr=expr, for_html=False)
     header = create_header(
         name,
         keys,

graphblas/core/matrix.py

@@ -123,12 +123,12 @@ def __del__(self):
             # it's difficult/dangerous to record the call, b/c `self.name` may not exist
             check_status(lib.GrB_Matrix_free(gb_obj), self)
 
-    def __repr__(self, mask=None):
+    def __repr__(self, mask=None, expr=None):
         from .formatting import format_matrix
         from .recorder import skip_record
 
         with skip_record:
-            return format_matrix(self, mask=mask)
+            return format_matrix(self, mask=mask, expr=expr)
 
     def _repr_html_(self, mask=None, collapse=False, expr=None):
         if self._parent is not None:

graphblas/core/scalar.py

@@ -103,10 +103,10 @@ def _expr_name_html(self):
         """The name used in the text for expressions in HTML formatting"""
         return self._name_html or repr(self.value)
 
-    def __repr__(self):
+    def __repr__(self, expr=None):
         from .formatting import format_scalar
 
-        return format_scalar(self)
+        return format_scalar(self, expr=expr)
 
     def _repr_html_(self, collapse=False, expr=None):
         from .formatting import format_scalar_html

graphblas/core/vector.py

@@ -138,12 +138,12 @@ def _as_matrix(self):
             name=f"(GrB_Matrix){self.name}",
         )
 
-    def __repr__(self, mask=None):
+    def __repr__(self, mask=None, expr=None):
         from .formatting import format_vector
         from .recorder import skip_record
 
         with skip_record:
-            return format_vector(self, mask=mask)
+            return format_vector(self, mask=mask, expr=expr)
 
     def _repr_html_(self, mask=None, collapse=False, expr=None):
         if self._parent is not None and mask is None:

graphblas/tests/test_formatting.py

@@ -4076,9 +4076,9 @@ def test_autocompute(A, B, v):
         "gb.MatrixExpression                        nrows  ncols  dtype\n"
         "A_1.ewise_add(A_1, op=monoid.plus[INT64])      1      5  INT64\n"
         "\n"
-        '"Result"   nvals  nrows  ncols  dtype   format\n'
-        "gb.Matrix      3      1      5  INT64  bitmapr\n"
-        "----------------------------------------------\n"
+        '"Result"   nvals  nrows  ncols  dtype\n'
+        "gb.Matrix      3      1      5  INT64\n"
+        "-------------------------------------\n"
         "   0 1  2 3  4\n"
         "0  0    2    4\n"
         "\n"
@@ -4094,9 +4094,9 @@ def test_autocompute(A, B, v):
         "gb.VectorExpression                                       size  dtype\n"
         "v_0.ewise_mult(v_1, op=binary.times[INT64])  36028797018963968  INT64\n"
         "\n"
-        '"Result"   nvals               size  dtype        format\n'
-        "gb.Vector      1  36028797018963968  INT64  sparse (iso)\n"
-        "--------------------------------------------------------\n"
+        '"Result"   nvals               size  dtype\n'
+        "gb.Vector      1  36028797018963968  INT64\n"
+        "------------------------------------------\n"
         "index 0                 1                  ... 36028797018963966 36028797018963967\n"
         "value                 2                    ...                                    \n"
         "\n"
@@ -4130,9 +4130,9 @@ def test_autocompute(A, B, v):
         "gb.MatrixEwiseMultExpr  nrows  ncols  left_dtype  right_dtype\n"
         "M_2 & M_2                   1      5        BOOL         BOOL\n"
         "\n"
-        '"Result"   nvals  nrows  ncols  dtype   format\n'
-        "gb.Matrix      3      1      5   BOOL  bitmapr\n"
-        "----------------------------------------------\n"
+        '"Result"   nvals  nrows  ncols  dtype\n'
+        "gb.Matrix      3      1      5   BOOL\n"
+        "-------------------------------------\n"
         "       0 1     2 3     4\n"
         "0  False    True    True\n"
         "\n"