langfun 0.1.2.dev202409160804__py3-none-any.whl → 0.1.2.dev202409180804__py3-none-any.whl

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/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/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/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/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.dist-info → langfun-0.1.2.dev202409180804.dist-info}/METADATA

@@ -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.dist-info → langfun-0.1.2.dev202409180804.dist-info}/RECORD

@@ -1,5 +1,5 @@
 langfun/__init__.py,sha256=mCES7t3R7Z-ZQYvG38-yrVqZubrXNfGCa8tI5HGB7mE,2274
-langfun/core/__init__.py,sha256=r86kuy-BiJIveqnXx5OklUUXtMG3q79nWRBum6zFOCQ,4835
+langfun/core/__init__.py,sha256=gKoZrxwxdR_UweutfeeECUEL6ogcr8lKk9ub5_9NaM0,4884
 langfun/core/component.py,sha256=nxF4UD7NLduPjrf4IAtysMAIg3IChfoQHjY77vC8f_E,10263
 langfun/core/component_test.py,sha256=q15Xn51cVTu2RKxZ9U5VQgT3bm6RQ4638bKhWBtvW5o,8220
 langfun/core/concurrent.py,sha256=D_zoLGFREGfm0G93V27wzOlFh3MjaDxUZKb9g6Z69d4,28019
@@ -10,7 +10,7 @@ langfun/core/langfunc.py,sha256=G50YgoVZ0y1GFw2ev41MlOqr6qa8YakbvNC0h_E0PiA,1114
 langfun/core/langfunc_test.py,sha256=ZLlj6ysNIWUlm0jcq6PbNUwdJ2XstW5QQT0L2s5GlGY,8753
 langfun/core/language_model.py,sha256=o1MPDdiZ7eRUhcCjxLMT6IYYXge6nM7elvCWQ-NANaU,26286
 langfun/core/language_model_test.py,sha256=ebJ1vnaxKSKvlwi6v07yHjn91xMiDw2bQ9DBnyVorYw,23303
-langfun/core/logging.py,sha256=oDSeqGIQogZJ6xuPTcr9mkmLC2YnLP67UHtTdWbbiVY,4250
+langfun/core/logging.py,sha256=wYDuPuGeS1hyJBzjMQgquyfLw-TUVO-b7H68UA8X-Eg,4279
 langfun/core/logging_test.py,sha256=poSsNGKi6G9LWOcWnTY0BQjj0BtaQknH-NK6FcQrVT4,2152
 langfun/core/memory.py,sha256=f-asN1F7Vehgdn_fK84v73GrEUOxRtaW934keutTKjk,2416
 langfun/core/message.py,sha256=7UOxNMA1Le0ZGkleryqwXcWojZ-l_hku5Sc58BsIOGw,18586
@@ -19,8 +19,8 @@ langfun/core/modality.py,sha256=g9wGx347oVofAJlMu_CpzTMIyTT9DJW8NfO4E-d-oNM,3879
 langfun/core/modality_test.py,sha256=7SwhixFME2Q1sIXRgJx97EZFiIyC31A9NVr6_nDtFv4,2441
 langfun/core/natural_language.py,sha256=3ynSnaYQnjE60LIPK5fyMgdIjubnPYZwzGq4rWPeloE,1177
 langfun/core/natural_language_test.py,sha256=LHGU_1ytbkGuSZQFIFP7vP3dBlcY4-A12fT6dbjUA0E,1424
-langfun/core/repr_utils.py,sha256=Y6ccoQUMpRxDv_jUy2QtnP9cdz3QBjJtTIgxGIU-kfM,5537
-langfun/core/repr_utils_test.py,sha256=_VhWpDbtlWaGadXL0gpmwQVmACenvzmLUng_AqR6zaE,2685
+langfun/core/repr_utils.py,sha256=S2aZQllHuy2syduFiYKJm--GPoJWRGS5cXvbC1pdEUs,6243
+langfun/core/repr_utils_test.py,sha256=ULG7gvgoyqQFWi0m6g2-E0GorNEr1nnZ0J_sZVQKz80,3036
 langfun/core/sampling.py,sha256=vygWvgC8MFw0_AKNSmz-ywMXJYWf8cl0tI8QycvAmyI,5795
 langfun/core/sampling_test.py,sha256=U7PANpMsl9E_pa4_Y4FzesSjcwg-u-LKHGCWSgv-8FY,3663
 langfun/core/subscription.py,sha256=euawEuSZP-BHydaT-AQpfYFL0m5pWPGcW0upFhrojqc,10930
@@ -46,7 +46,7 @@ langfun/core/coding/python/permissions_test.py,sha256=w5EDb8QxpxgJyZkojyzVWQvDfg
 langfun/core/eval/__init__.py,sha256=Ogdr9OtTywhhLPHi3AZzOD2mXX2oyaHWflrSTMm96uA,1899
 langfun/core/eval/base.py,sha256=xDZQ3lu5oJaPDZCE5-QbBEajq--HRU64GVKb3xB64aI,74738
 langfun/core/eval/base_test.py,sha256=VEraWaRybSxOCOcZrZouNkiroDEPR6uyFBJoAz-1pQg,26930
-langfun/core/eval/matching.py,sha256=foqHIfEbmgWMfGv3ia0bCsf6m6PTr_Oeb8FZobbyud8,9900
+langfun/core/eval/matching.py,sha256=vjA7g413kAV7VASwNIVUayMhhXvtjttY0nr3UdHqXwk,10132
 langfun/core/eval/matching_test.py,sha256=f7iVyXH5KGJBWt4Wp14Bt9J3X59A6Ayfog9MbuFvPew,5532
 langfun/core/eval/patching.py,sha256=R0s2eAd1m97exQt06dmUL0V_MBG0W2Hxg7fhNB7cXW0,3866
 langfun/core/eval/patching_test.py,sha256=8kCd54Egjju22FMgtJuxEsrXkW8ifs-UUBHtrCG1L6w,4775
@@ -119,8 +119,8 @@ langfun/core/templates/demonstration.py,sha256=vCrgYubdZM5Umqcgp8NUVGXgr4P_c-fik
 langfun/core/templates/demonstration_test.py,sha256=SafcDQ0WgI7pw05EmPI2S4v1t3ABKzup8jReCljHeK4,2162
 langfun/core/templates/selfplay.py,sha256=yhgrJbiYwq47TgzThmHrDQTF4nDrTI09CWGhuQPNv-s,2273
 langfun/core/templates/selfplay_test.py,sha256=rBW2Qr8yi-aWYwoTwRR-n1peKyMX9QXPZXURjLgoiRs,2264
-langfun-0.1.2.dev202409160804.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-langfun-0.1.2.dev202409160804.dist-info/METADATA,sha256=Hoxy-A9HeoH_XYYSkiN0-MLqo9nL45Occt12WEcMmK0,8890
-langfun-0.1.2.dev202409160804.dist-info/WHEEL,sha256=5Mi1sN9lKoFv_gxcPtisEVrJZihrm_beibeg5R6xb4I,91
-langfun-0.1.2.dev202409160804.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
-langfun-0.1.2.dev202409160804.dist-info/RECORD,,
+langfun-0.1.2.dev202409180804.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+langfun-0.1.2.dev202409180804.dist-info/METADATA,sha256=8r43i6FzNi9hKws1cufJ5ZdtRHDWuyRiDZ7UniEq8gE,8890
+langfun-0.1.2.dev202409180804.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+langfun-0.1.2.dev202409180804.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
+langfun-0.1.2.dev202409180804.dist-info/RECORD,,

{langfun-0.1.2.dev202409160804.dist-info → langfun-0.1.2.dev202409180804.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.0.0)
+Generator: setuptools (75.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any