langfun 0.1.2.dev202409160804__tar.gz → 0.1.2.dev202409180804__tar.gz

{langfun-0.1.2.dev202409160804 → langfun-0.1.2.dev202409180804}/PKG-INFO

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

{langfun-0.1.2.dev202409160804 → langfun-0.1.2.dev202409180804}/langfun/core/__init__.py

@@ -45,6 +45,7 @@ use_context = context
 from langfun.core.component import use_settings
 
 from langfun.core.component import get_contextual_override
+from langfun.core.component import context_value
 
 # Value marker for attribute whose values will be provided from parent
 # objects or from the `pg.component_context` context manager.

{langfun-0.1.2.dev202409160804 → langfun-0.1.2.dev202409180804}/langfun/core/eval/matching.py

@@ -275,9 +275,19 @@ class Matching(base.Evaluation):
     for i, (example, output, message) in enumerate(self.matches):
       bgcolor = 'white' if i % 2 == 0 else '#DDDDDD'
       s.write(f'<tr style="background-color: {bgcolor}"><td>{i + 1}</td>')
-      input_str = pg.format(example, verbose=False, max_bytes_len=32)
+      input_str = lf.repr_utils.escape_quoted(
+          pg.format(
+              example, verbose=False, max_bytes_len=32,
+              custom_format='_repr_html_'
+          )
+      )
       s.write(f'<td style="color:green;white-space:pre-wrap">{input_str}</td>')
-      output_str = pg.format(output, verbose=False, max_bytes_len=32)
+      output_str = lf.repr_utils.escape_quoted(
+          pg.format(
+              output, verbose=False, max_bytes_len=32,
+              custom_format='_repr_html_'
+          )
+      )
       s.write(f'<td style="color:blue;white-space:pre-wrap">{output_str}</td>')
       s.write('<td>')
       self._render_message(message, s)

{langfun-0.1.2.dev202409160804 → langfun-0.1.2.dev202409180804}/langfun/core/logging.py

@@ -13,11 +13,14 @@
 # limitations under the License.
 """Langfun event logging."""
 
+from collections.abc import Iterator
+import contextlib
 import datetime
 import io
 import typing
-from typing import Any, Literal, ContextManager
+from typing import Any, Literal
 
+from langfun.core import component
 from langfun.core import console
 from langfun.core import repr_utils
 import pyglove as pg
@@ -25,18 +28,21 @@ import pyglove as pg
 
 LogLevel = Literal['debug', 'info', 'error', 'warning', 'fatal']
 _LOG_LEVELS = list(typing.get_args(LogLevel))
-_TLS_KEY_MIN_LOG_LEVEL = '_event_log_level'
 
 
-def use_log_level(log_level: LogLevel | None = 'info') -> ContextManager[None]:
+@contextlib.contextmanager
+def use_log_level(log_level: LogLevel = 'info') -> Iterator[None]:
   """Contextmanager to enable logging at a given level."""
-  return pg.object_utils.thread_local_value_scope(
-      _TLS_KEY_MIN_LOG_LEVEL, log_level, 'info')
+  with component.context(__event_log_level__=log_level):
+    try:
+      yield
+    finally:
+      pass
 
 
-def get_log_level() -> LogLevel | None:
+def get_log_level() -> LogLevel:
   """Gets the current minimum log level."""
-  return pg.object_utils.thread_local_get(_TLS_KEY_MIN_LOG_LEVEL, 'info')
+  return component.context_value('__event_log_level__', 'info')
 
 
 class LogEntry(pg.Object):

{langfun-0.1.2.dev202409160804 → langfun-0.1.2.dev202409180804}/langfun/core/repr_utils.py

@@ -94,7 +94,7 @@ def write_maybe_shared(s: io.StringIO, content: str) -> bool:
 
 
 def html_repr(
-    value: Any,
+    value: dict[str, Any],
     item_color: Callable[
         [str, str],
         tuple[
@@ -121,35 +121,38 @@ def html_repr(
   s.write('<table style="border-top: 1px solid #EEEEEE;">')
   item_color = item_color or (lambda k, v: (None, '#F1C40F', None, None))
 
-  for k, v in pg.object_utils.flatten(value).items():
-    if isinstance(v, pg.Ref):
-      v = v.value
-    if hasattr(v, '_repr_html_'):
-      cs = v._repr_html_()  # pylint: disable=protected-access
-    else:
-      cs = f'<span style="white-space: pre-wrap">{html.escape(str(v))}</span>'
-
-    key_color, key_bg_color, value_color, value_bg_color = item_color(k, v)
-    key_span = html_round_text(
-        k,
-        text_color=key_color,
-        background_color=key_bg_color,
-        margin_bottom='0px'
-    )
-    value_color_style = f'color: {value_color};' if value_color else ''
-    value_bg_color_style = (
-        f'background-color: {value_bg_color};' if value_bg_color else ''
-    )
-    s.write(
-        '<tr>'
-        '<td style="padding: 5px; vertical-align: top; '
-        f'border-bottom: 1px solid #EEEEEE">{key_span}</td>'
-        '<td style="padding: 15px 5px 5px 5px; vertical-align: top; '
-        'border-bottom: 1px solid #EEEEEE;'
-        f'{value_color_style}{value_bg_color_style}">{cs}</td></tr>'
-    )
-  s.write('</table></div>')
-  return s.getvalue()
+  with (pg.str_format(custom_format='_repr_html_'),
+        pg.repr_format(custom_format='_repr_html_')):
+    for k, v in pg.object_utils.flatten(value).items():
+      if isinstance(v, pg.Ref):
+        v = v.value
+      if hasattr(v, '_repr_html_'):
+        cs = v._repr_html_()  # pylint: disable=protected-access
+      else:
+        cs = html.escape(v) if isinstance(v, str) else escape_quoted(str(v))
+        cs = f'<span style="white-space: pre-wrap">{cs}</span>'
+
+      key_color, key_bg_color, value_color, value_bg_color = item_color(k, v)
+      key_span = html_round_text(
+          k,
+          text_color=key_color,
+          background_color=key_bg_color,
+          margin_bottom='0px'
+      )
+      value_color_style = f'color: {value_color};' if value_color else ''
+      value_bg_color_style = (
+          f'background-color: {value_bg_color};' if value_bg_color else ''
+      )
+      s.write(
+          '<tr>'
+          '<td style="padding: 5px; vertical-align: top; '
+          f'border-bottom: 1px solid #EEEEEE">{key_span}</td>'
+          '<td style="padding: 15px 5px 5px 5px; vertical-align: top; '
+          'border-bottom: 1px solid #EEEEEE;'
+          f'{value_color_style}{value_bg_color_style}">{cs}</td></tr>'
+      )
+    s.write('</table></div>')
+    return s.getvalue()
 
 
 def html_round_text(
@@ -172,3 +175,23 @@ def html_round_text(
       f'margin-top: {margin_top}; margin-bottom: {margin_bottom}; '
       f'white-space: {whitespace}">{text}</span>'
   )
+
+
+def escape_quoted(s: str):
+  """Escape quoted parts within a string."""
+  r = io.StringIO()
+  quote_char = None
+  quote_start = -1
+  for i, c in enumerate(s):
+    if c in ('\'', '"'):
+      if quote_char is None:
+        quote_char = c
+        quote_start = i
+      elif quote_char == c:
+        r.write(c)
+        r.write(html.escape(s[quote_start + 1:i]))
+        r.write(c)
+        quote_char = None
+    elif quote_char is None:
+      r.write(c)
+  return r.getvalue()

{langfun-0.1.2.dev202409160804 → langfun-0.1.2.dev202409180804}/langfun/core/repr_utils_test.py

@@ -54,6 +54,15 @@ class SharingContentTest(unittest.TestCase):
     self.assertEqual(ctx1['<style>b</style>'], 2)
     self.assertEqual(ctx1['<style>a</style>'], 4)
 
+  def test_escape_quoted(self):
+    self.assertEqual(
+        repr_utils.escape_quoted(str('<a>')), '<a>'
+    )
+    self.assertEqual(
+        repr_utils.escape_quoted('x=<a>, b="<a>"'),
+        'x=<a>, b="&lt;a&gt;"'
+    )
+
   def test_html(self):
     html = repr_utils.Html('<div>foo</div>')
     self.assertEqual(html.content, '<div>foo</div>')
@@ -63,12 +72,18 @@ class SharingContentTest(unittest.TestCase):
     class Foo(pg.Object):
       x: int
 
+    class Bar(pg.Object):
+
+      def _repr_html_(self):
+        return '<bar>'
+
     html = repr_utils.html_repr(
-        {'foo': pg.Ref(Foo(1)), 'bar': '<lf_image>'}
+        {'foo': pg.Ref(Foo(1)), 'bar': Bar(), 'baz': '<lf_image>'}
     )
     self.assertIn('foo</span>', html)
-    self.assertNotIn('Ref', html)
+    self.assertIn('<bar>', html)
     self.assertIn('&lt;lf_image&gt;', html)
+    self.assertNotIn('Ref', html)
 
 
 if __name__ == '__main__':

{langfun-0.1.2.dev202409160804 → langfun-0.1.2.dev202409180804}/langfun.egg-info/PKG-INFO

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