Implement format_number utility and update various summaries to use it to separate 1000s with a thin space

Author: hossam26644

python/tests/test_util.py

@@ -371,6 +371,18 @@ def test_naturalsize(value, expected):
         assert util.naturalsize(-value) == expected
 
 
+def test_format_number():
+    assert util.format_number(0) == "0"
+    assert util.format_number("1.23") == "1.23"
+    assert util.format_number(3216546.34) == "3 216 546.3"
+    assert util.format_number(3216546.34, 9) == "3 216 546.34"
+    assert util.format_number(-3456.23) == "-3 456.23"
+
+    with pytest.raises(TypeError) as e_info:
+        util.format_number("bad")
+        assert str(e_info.value) == "The string cannot be converted to a number"
+
+
 @pytest.mark.parametrize(
     "obj, expected",
     [

python/tskit/genotypes.py

@@ -334,22 +334,23 @@ def __str__(self) -> str:
         Return a plain text summary of the contents of a variant.
         """
         try:
-            site_id = self.site.id
-            site_position = self.site.position
+            site_id = util.format_number(self.site.id)
+            site_position = util.format_number(self.site.position)
             counts = self.counts()
             freqs = self.frequencies()
             rows = (
                 [
-                    ["Site id", f"{site_id:,}"],
-                    ["Site position", f"{site_position:,}"],
-                    ["Number of samples", f"{len(self.samples):,}"],
-                    ["Number of alleles", f"{self.num_alleles:,}"],
+                    ["Site id", f"{site_id}"],
+                    ["Site position", f"{site_position}"],
+                    ["Number of samples", f"{util.format_number(len(self.samples))}"],
+                    ["Number of alleles", f"{util.format_number(self.num_alleles)}"],
                 ]
                 + [
                     [
                         f"Samples with allele "
                         f"""{'missing' if k is None else "'" + k + "'"}""",
-                        f"{counts[k]:,} ({freqs[k] * 100:.2g}%)",
+                        f"{util.format_number(counts[k])} ({
+                            util.format_number(freqs[k] * 100, 2)}%)",
                     ]
                     for k in self.alleles
                 ]

python/tskit/trees.py

@@ -2814,17 +2814,17 @@ def __str__(self):
         Return a plain text summary of a tree in a tree sequence
         """
         tree_rows = [
-            ["Index", f"{self.index:,}"],
+            ["Index", f"{util.format_number(self.index)}"],
             [
                 "Interval",
-                f"{self.interval.left:,.8g}-{self.interval.right:,.8g}"
-                f"({self.span:,.8g})",
+                f"{util.format_number(self.interval.left)}-{util.format_number(self.interval.right)}"
+                f"({util.format_number(self.span)})",
             ],
-            ["Roots", f"{self.num_roots:,}"],
-            ["Nodes", f"{len(self.preorder()):,}"],
-            ["Sites", f"{self.num_sites:,}"],
-            ["Mutations", f"{self.num_mutations:,}"],
-            ["Total Branch Length", f"{self.total_branch_length:,.8g}"],
+            ["Roots", f"{util.format_number(self.num_roots)}"],
+            ["Nodes", f"{util.format_number(len(self.preorder()))}"],
+            ["Sites", f"{util.format_number(self.num_sites)}"],
+            ["Mutations", f"{util.format_number(self.num_mutations)}"],
+            ["Total Branch Length", f"{util.format_number(self.total_branch_length)}"],
         ]
         return util.unicode_table(tree_rows, title="Tree")
 
@@ -4391,17 +4391,10 @@ def __str__(self):
         Return a plain text summary of the contents of a tree sequence
         """
         ts_rows = [
-            ["Trees", str(self.num_trees)],
-            [
-                "Sequence Length",
-                str(
-                    int(self.sequence_length)
-                    if self.discrete_genome
-                    else self.sequence_length
-                ),
-            ],
+            ["Trees", util.format_number(self.num_trees)],
+            ["Sequence Length", util.format_number(self.sequence_length)],
             ["Time Units", self.time_units],
-            ["Sample Nodes", str(self.num_samples)],
+            ["Sample Nodes", util.format_number(self.num_samples)],
             ["Total Size", util.naturalsize(self.nbytes)],
         ]
         header = ["Table", "Rows", "Size", "Has Metadata"]
@@ -4410,7 +4403,7 @@ def __str__(self):
             table_rows.append(
                 [
                     name.capitalize(),
-                    f"{table.num_rows:,}",
+                    f"{util.format_number(table.num_rows)}",
                     util.naturalsize(table.nbytes),
                     (
                         "Yes"

python/tskit/util.py

@@ -480,6 +480,25 @@ def unicode_table(
     return "".join(out)
 
 
+def format_number(number, sig_digits=8):
+    """
+    Format a number with thin spaces as thousands separators
+    and up to `sig_digits` significant digits using 'g' format.
+
+    number: int, float, or a numeric string.
+    sig_digits: int, number of significant digits to display.
+    Returns a string.
+    """
+    if isinstance(number, str):
+        try:
+            number = float(number)
+        except ValueError:
+            raise TypeError("The string cannot be converted to a number")
+
+    fmt = f",.{sig_digits}g"
+    return format(number, fmt).replace(",", "\u2009")
+
+
 def html_table(rows, *, header):
     headers = "".join(f"<th>{h}</th>" for h in header)
     rows = (
@@ -519,7 +538,7 @@ def tree_sequence_html(ts):
         f"""
             <tr>
                 <td>{name.capitalize()}</td>
-                <td>{table.num_rows:,}</td>
+                <td>{format_number(table.num_rows)}</td>
                 <td>{naturalsize(table.nbytes)}</td>
                 <td style="text-align: center;">
                     {'✅' if hasattr(table, "metadata") and len(table.metadata) > 0
@@ -599,10 +618,10 @@ def tree_sequence_html(ts):
                             </tr>
                         </thead>
                         <tbody>
-                            <tr><td>Trees</td><td>{ts.num_trees:,}</td></tr>
-                            <tr><td>Sequence Length</td><td>{ts.sequence_length:,}</td></tr>
+                            <tr><td>Trees</td><td>{format_number(ts.num_trees)}</td></tr>
+                            <tr><td>Sequence Length</td><td>{format_number(ts.sequence_length)}</td></tr>
                             <tr><td>Time Units</td><td>{ts.time_units}</td></tr>
-                            <tr><td>Sample Nodes</td><td>{ts.num_samples:,}</td></tr>
+                            <tr><td>Sample Nodes</td><td>{format_number(ts.num_samples)}</td></tr>
                             <tr><td>Total Size</td><td>{naturalsize(ts.nbytes)}</td></tr>
                             <tr>
                                 <td>Metadata</td><td style="text-align: left;">{md}</td>
@@ -671,13 +690,13 @@ def tree_html(tree):
                       </tr>
                     </thead>
                     <tbody>
-                      <tr><td>Index</td><td>{tree.index:,}</td></tr>
-                      <tr><td>Interval</td><td>{tree.interval.left:,.8g}-{tree.interval.right:,.8g} ({tree.span:,.8g})</td></tr>
-                      <tr><td>Roots</td><td>{tree.num_roots:,}</td></tr>
-                      <tr><td>Nodes</td><td>{len(tree.preorder()):,}</td></tr>
-                      <tr><td>Sites</td><td>{tree.num_sites:,}</td></tr>
-                      <tr><td>Mutations</td><td>{tree.num_mutations:,}</td></tr>
-                      <tr><td>Total Branch Length</td><td>{tree.total_branch_length:,.8g}</td></tr>
+                      <tr><td>Index</td><td>{format_number(tree.index)}</td></tr>
+                      <tr><td>Interval</td><td>{format_number(tree.interval.left)}-{format_number(tree.interval.right)} ({format_number(tree.span)})</td></tr>
+                      <tr><td>Roots</td><td>{format_number(tree.num_roots)}</td></tr>
+                      <tr><td>Nodes</td><td>{format_number(len(tree.preorder()))}</td></tr>
+                      <tr><td>Sites</td><td>{format_number(tree.num_sites)}</td></tr>
+                      <tr><td>Mutations</td><td>{format_number(tree.num_mutations)}</td></tr>
+                      <tr><td>Total Branch Length</td><td>{format_number(tree.total_branch_length)}</td></tr>
                     </tbody>
                   </table>
                 </div>
@@ -746,18 +765,18 @@ def variant_html(variant):
         return (
             html_body_head
             + f"""
-                <tr><td>Site Id</td><td>{site_id:,}</td></tr>
-                <tr><td>Site Position</td><td>{site_position:,.8g}</td></tr>
-                <tr><td>Number of Samples</td><td>{num_samples:,}</td></tr>
-                <tr><td>Number of Alleles</td><td>{num_alleles:,}</td></tr>
+                <tr><td>Site Id</td><td>{format_number(site_id)}</td></tr>
+                <tr><td>Site Position</td><td>{format_number(site_position)}</td></tr>
+                <tr><td>Number of Samples</td><td>{format_number(num_samples)}</td></tr>
+                <tr><td>Number of Alleles</td><td>{format_number(num_alleles)}</td></tr>
             """
             + "\n".join(
                 [
                     f"""<tr><td>Samples with Allele {'missing' if k is None
                                                      else "'" + k + "'"}</td><td>"""
-                    + f"{counts[k]:,}"
+                    + f"{format_number(counts[k])}"
                     + " "
-                    + f"({freqs[k] * 100:,.2g}%)"
+                    + f"({format_number(freqs[k] * 100, 2)}%)"
                     + "</td></tr>"
                     for k in variant.alleles
                 ]