langfun 0.1.1.dev20240728__tar.gz → 0.1.1.dev20240730__tar.gz

{langfun-0.1.1.dev20240728 → langfun-0.1.1.dev20240730}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langfun
-Version: 0.1.1.dev20240728
+Version: 0.1.1.dev20240730
 Summary: Langfun: Language as Functions.
 Home-page: https://github.com/google/langfun
 Author: Langfun Authors

{langfun-0.1.1.dev20240728 → langfun-0.1.1.dev20240730}/langfun/core/eval/base.py

@@ -1304,20 +1304,22 @@ class Evaluation(Evaluable):
     s = io.StringIO()
     definition = _html_repr(self, compact=False, escape=True)
     s.write('<div><table><tr><td>')
+    self._render_link(
+        s,
+        definition,
+        self.hash,
+        '',
+        lambda: self.link(self.dir),
+    )
     if self.result is None:
       s.write(
-          f'<a target="_blank" title="{definition}" '
-          f'href="{self.link(self.dir)}">{self.hash}</a>'
           '</td></tr><tr><td>'
           '<span style="color: gray">(IN-PROGRESS...)</span>'
       )
     else:
-      s.write(
-          f'<a target="_blank" title="{definition}" '
-          f'href="{self.index_link}">{self.hash}</a>'
-          f' &nbsp;[<a href="{self.link(self.dir)}">dir</a>]'
-          '</td></tr><tr><td>'
-      )
+      if self.dir:
+        s.write(f' &nbsp;[<a href="{self.link(self.dir)}">dir</a>]')
+      s.write('</td></tr><tr><td>')
       self._render_summary_metrics(s)
 
       # Summarize average usage.
@@ -1341,6 +1343,20 @@ class Evaluation(Evaluable):
         f'" style="color:gray">({total} tokens)</a>'
     )
 
+  def _render_link(self,
+                   s: io.StringIO,
+                   title: str,
+                   text: str,
+                   style: str,
+                   url_fn: Callable[[], str]) -> None:
+    """Renders a link in HTML."""
+    s.write(
+        f'<a target="_blank" title="{title}" style="{style}"'
+    )
+    if self.dir:
+      s.write(f' href="{url_fn()}"')
+    s.write(f'>{text}</a>')
+
   def _render_summary_metrics(self, s: io.StringIO) -> None:
     """Renders metrics in HTML."""
     assert self.result is not None
@@ -1362,14 +1378,12 @@ class Evaluation(Evaluable):
     extra_style = ''
     if m.oop_failure_rate > 0.1 and m.oop_failures > 3:
       extra_style = ';font-weight:bold'
-    s.write(
-        '<a title="%s" href="%s" style="color:magenta%s">%s</a>'
-        % (
-            oop_failure_title,
-            self.oop_failures_link,
-            extra_style,
-            self._format_rate(m.oop_failure_rate),
-        )
+    self._render_link(
+        s,
+        oop_failure_title,
+        self._format_rate(m.oop_failure_rate),
+        f'color:magenta{extra_style}',
+        lambda: self.oop_failures_link,
     )
     s.write(' | ')
 
@@ -1387,14 +1401,12 @@ class Evaluation(Evaluable):
           )
 
     extra_style = ';font-weight:bold' if m.non_oop_failures > 0 else ''
-    s.write(
-        '<a title="%s" href="%s" style="color:red%s">%s</a>'
-        % (
-            non_oop_failure_title,
-            self.non_oop_failures_link,
-            extra_style,
-            self._format_rate(m.non_oop_failure_rate),
-        )
+    self._render_link(
+        s,
+        non_oop_failure_title,
+        self._format_rate(m.non_oop_failure_rate),
+        f'color:red{extra_style}',
+        lambda: self.non_oop_failures_link,
     )
 
   def _format_rate(self, rate: float) -> str:

{langfun-0.1.1.dev20240728 → langfun-0.1.1.dev20240730}/langfun/core/eval/matching.py

@@ -239,24 +239,20 @@ class Matching(base.Evaluation):
     """Renders metrics in HTML."""
     assert self.result is not None
     m = self.result.metrics
-    s.write(
-        '<a title="Matches (%d/%d)" href="%s" style="color:green">%s</a>'
-        % (
-            m.num_matches,
-            m.total,
-            self.matches_link,
-            self._format_rate(m.match_rate),
-        )
+    self._render_link(
+        s,
+        'Matches (%d/%d)' % (m.num_matches, m.total),
+        self._format_rate(m.match_rate),
+        'color:green',
+        lambda: self.matches_link,
     )
     s.write(' | ')
-    s.write(
-        '<a title="Mismatches (%d/%d)" href="%s" style="color:orange">%s</a>'
-        % (
-            m.num_mismatches,
-            m.total,
-            self.mismatches_link,
-            self._format_rate(m.mismatch_rate),
-        )
+    self._render_link(
+        s,
+        'Mismatches (%d/%d)' % (m.num_mismatches, m.total),
+        self._format_rate(m.mismatch_rate),
+        'color:orange',
+        lambda: self.mismatches_link,
     )
     s.write(' | ')
     super()._render_summary_metrics(s)

{langfun-0.1.1.dev20240728 → langfun-0.1.1.dev20240730}/langfun/core/eval/scoring.py

@@ -172,14 +172,12 @@ class Scoring(base.Evaluation):
     """Renders metrics in HTML."""
     assert self.result is not None
     m = self.result.metrics
-    s.write(
-        '<a title="Average score (%d/%d)" href="%s" style="color:green">%s</a>'
-        % (
-            m.num_scored,
-            m.total,
-            self.scored_link,
-            '%.2f%%' % (m.score_rate * 100),
-        )
+    self._render_link(
+        s,
+        'Average score (%d/%d)' % (m.num_scored, m.total),
+        '%.2f (%.2f%%)' % (m.avg_score, m.score_rate * 100),
+        'color:green',
+        lambda: self.scored_link,
     )
     s.write(' | ')
     super()._render_summary_metrics(s)

{langfun-0.1.1.dev20240728 → langfun-0.1.1.dev20240730}/langfun.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langfun
-Version: 0.1.1.dev20240728
+Version: 0.1.1.dev20240730
 Summary: Langfun: Language as Functions.
 Home-page: https://github.com/google/langfun
 Author: Langfun Authors