langfun 0.1.2.dev202409170804__py3-none-any.whl → 0.1.2.dev202409190804__py3-none-any.whl

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/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/core/template.py

@@ -231,6 +231,16 @@ class Template(
     """Returns the missing variable names."""
     return self.vars(closure=True, specified=False)
 
+  @classmethod
+  def raw_str(cls, text: str) -> str:
+    """Returns a template string that preserve the text as original."""
+    return '{% raw %}' + text + '{% endraw %}'
+
+  @classmethod
+  def from_raw_str(cls, text: str) -> 'Template':
+    """Returns a template that preserve the text as original."""
+    return cls(cls.raw_str(text), clean=False)
+
   def render(
       self,
       *,

langfun/core/template_test.py

@@ -98,6 +98,21 @@ class BasicTest(unittest.TestCase):
     self.assertEqual(d.z.render(), 'Bye, 1')
     self.assertEqual(d.p.render(), 'Again Hello, 1')
 
+  def test_raw_text(self):
+    self.assertEqual(
+        Template(
+            '{{a}}' + Template.raw_str('\n{{d}}, {%x%}\n') + '{{b}}',
+            a='hi', b=1
+        ).render().text,
+        'hi\n{{d}}, {%x%}\n1'
+    )
+
+  def test_from_raw_str(self):
+    self.assertEqual(
+        Template.from_raw_str('\n{{d}}, {%x%}\n').render().text,
+        '\n{{d}}, {%x%}\n'
+    )
+
 
 class DefinitionTest(unittest.TestCase):
 

{langfun-0.1.2.dev202409170804.dist-info → langfun-0.1.2.dev202409190804.dist-info}/METADATA

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

{langfun-0.1.2.dev202409170804.dist-info → langfun-0.1.2.dev202409190804.dist-info}/RECORD

@@ -19,14 +19,14 @@ 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
 langfun/core/subscription_test.py,sha256=Y4ZdbZEwm83YNZBxHff0QR4QUa4rdaNXA3_jfIcArBo,8717
-langfun/core/template.py,sha256=UhNNGUDJ4StUhPBKzHmjym36khxHOGWGr9MDxBwgxQA,22284
-langfun/core/template_test.py,sha256=cb005qM_3dvJikaPDB3rirfIrMAIIVRpoiXGREGJ43o,15468
+langfun/core/template.py,sha256=AWHJwWjsPgf8r584_HOleBqgN90oKCpW8OMx-gdljuM,22635
+langfun/core/template_test.py,sha256=YCBa9YMYtc_8X2gNSJvvQKpSovZy5A4YgIniCvm-1Ys,15843
 langfun/core/text_formatting.py,sha256=d7t9vaY6aCn1dkfkikpNYnBy5E_i93vHbfyDWFclGZU,5284
 langfun/core/text_formatting_test.py,sha256=ck0Xzdd4YF4CtCUj7VE0GybfbAyKQ8p3xkM1FBGrqIk,2096
 langfun/core/coding/__init__.py,sha256=5utju_fwEsImaiftx4oXKl9FAM8p281k8-Esdh_-m1w,835
@@ -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.dev202409170804.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-langfun-0.1.2.dev202409170804.dist-info/METADATA,sha256=atoHFAR24zaLtcMo2sp5-Wpbt6zWK8IHVx8RkjltNMc,8890
-langfun-0.1.2.dev202409170804.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-langfun-0.1.2.dev202409170804.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
-langfun-0.1.2.dev202409170804.dist-info/RECORD,,
+langfun-0.1.2.dev202409190804.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+langfun-0.1.2.dev202409190804.dist-info/METADATA,sha256=jXSHbJHya-kBejre47rbdqgVk2jtBoX5lEbegEyaK18,8890
+langfun-0.1.2.dev202409190804.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+langfun-0.1.2.dev202409190804.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
+langfun-0.1.2.dev202409190804.dist-info/RECORD,,