langfun 0.1.2.dev202410140804__py3-none-any.whl → 0.1.2.dev202410180804__py3-none-any.whl

langfun/core/template.py

@@ -17,7 +17,7 @@ import contextlib
 import dataclasses
 import functools
 import inspect
-from typing import Annotated, Any, Callable, Iterator, Sequence, Set, Tuple, Type, Union
+from typing import Annotated, Any, Callable, Iterator, Set, Tuple, Type, Union
 
 import jinja2
 from jinja2 import meta as jinja2_meta
@@ -531,59 +531,48 @@ class Template(
       *,
       view: pg.views.HtmlTreeView,
       root_path: pg.KeyPath,
-      collapse_template_vars_level: int | None = pg.View.PresetArgValue(1),
-      collapse_level: int | None = pg.View.PresetArgValue(1),  # pytype: disable=annotation-type-mismatch
+      collapse_level: int | None = None,
+      extra_flags: dict[str, Any] | None = None,
+      debug: bool = False,
       **kwargs,
   ):
+    extra_flags = extra_flags if extra_flags is not None else {}
+    collapse_template_vars_level: int | None = extra_flags.get(
+        'collapse_template_vars_level', 1
+    )
+
     def render_template_str():
       return pg.Html.element(
           'div',
           [
               pg.Html.element('span', [self.template_str])
           ],
-          css_class=['template-str'],
+          css_classes=['template-str'],
       )
 
     def render_fields():
-      def render_value_fn(value, *, root_path, **kwargs):
-        if isinstance(value, component.ContextualAttribute):
-          inferred = self.sym_inferred(root_path.key, pg.MISSING_VALUE)
-          if inferred != pg.MISSING_VALUE:
-            return pg.Html.element(
-                'div',
-                [
-                    view.render(inferred, root_path=root_path, **kwargs)
-                ],
-                css_class=['inferred-value'],
-            )
-          else:
-            return pg.Html.element(
-                'span',
-                ['(external)'],
-                css_class=['contextual-variable'],
-            )
-        return view.render(
-            value, root_path=root_path, **kwargs
-        )
       return pg.Html.element(
           'fieldset',
           [
               pg.Html.element('legend', ['Template Variables']),
               view.complex_value(
-                  self.sym_init_args,
+                  {k: v for k, v in self.sym_items()},
                   name='fields',
                   root_path=root_path,
-                  render_value_fn=render_value_fn,
-                  exclude_keys=['template_str', 'clean'],
                   parent=self,
-                  collapse_level=view.max_collapse_level(
-                      collapse_level,
-                      collapse_template_vars_level,
-                      root_path
-                  ),
+                  exclude_keys=['template_str', 'clean'],
+                  collapse_level=max(
+                      collapse_template_vars_level, collapse_level
+                  ) if collapse_level is not None else None,
+                  extra_flags=extra_flags,
+                  debug=debug,
+                  **view.get_passthrough_kwargs(
+                      remove=['exclude_keys'],
+                      **kwargs,
+                  )
               ),
           ],
-          css_class=['template-fields'],
+          css_classes=['template-fields'],
       )
 
     return pg.Html.element(
@@ -592,11 +581,12 @@ class Template(
             render_template_str(),
             render_fields(),
         ],
-        css_class=['complex_value'],
+        css_classes=['complex_value'],
     )
 
-  def _html_style(self) -> list[str]:
-    return super()._html_style() + [
+  @classmethod
+  def _html_tree_view_css_styles(cls) -> list[str]:
+    return super()._html_tree_view_css_styles() + [
         """
         /* Langfun Template styles. */
         .template-str {
@@ -619,22 +609,19 @@ class Template(
             font-size: 0.8em;
             margin: 5px 0px 5px 0px;
         }
-        .inferred-value::after {
-            content: ' (inferred)';
-            color: gray;
-            font-style: italic;
-        }
-        .contextual-variable {
-            margin: 0px 0px 0px 5px;
-            font-style: italic;
-            color: gray;
-        }
         """
     ]
 
-  # Additional CSS class to add to the root <details> element.
-  def _html_element_class(self) -> Sequence[str] | None:
-    return super()._html_element_class() + ['lf-template']
+  @classmethod
+  @functools.cache
+  def _html_tree_view_config(cls) -> dict[str, Any]:
+    return pg.views.HtmlTreeView.get_kwargs(
+        super()._html_tree_view_config(),
+        dict(
+            css_classes=['lf-template'],
+        )
+    )
+
 
 # Register converter from str to LangFunc, therefore we can always
 # pass strs to attributes that accept LangFunc.

langfun/core/template_test.py

@@ -579,12 +579,50 @@ class HtmlTest(unittest.TestCase):
       """
       y: Any
 
+    self.assertIn(
+        inspect.cleandoc(
+            """
+            /* Langfun Template styles. */
+            .template-str {
+                padding: 10px;
+                margin: 10px 5px 10px 5px;
+                font-style: italic;
+                font-size: 1.1em;
+                white-space: pre-wrap;
+                border: 1px solid #EEE;
+                border-radius: 5px;
+                background-color: #EEE;
+                color: #cc2986;
+            }
+            .template-fields {
+                margin: 0px 0px 5px 0px;
+                border: 1px solid #EEE;
+                padding: 5px;
+            }
+            .template-fields > legend {
+                font-size: 0.8em;
+                margin: 5px 0px 5px 0px;
+            }
+            """
+        ),
+        Foo(x=1, y=2).to_html().style_section,
+    )
+    self.assert_html_content(
+        Foo(x=Bar('{{y}} + {{z}}'), y=1).to_html(
+            enable_summary_tooltip=False,
+        ),
+        """
+        <details open class="pyglove foo lf-template"><summary><div class="summary-title lf-template">Foo(...)</div></summary><div class="complex_value"><div class="template-str"><span>{{x}} + {{y}} = ?</span></div><fieldset class="template-fields"><legend>Template Variables</legend><div class="complex-value foo"><details class="pyglove bar lf-template"><summary><div class="summary-name lf-template">x<span class="tooltip lf-template">x</span></div><div class="summary-title lf-template">Bar(...)</div></summary><div class="complex_value"><div class="template-str"><span>{{y}} + {{z}}</span></div><fieldset class="template-fields"><legend>Template Variables</legend><div class="complex-value bar"><details open class="pyglove contextual-attribute"><summary><div class="summary-name">y<span class="tooltip">x.y</span></div><div class="summary-title">ContextualAttribute(...)</div></summary><span class="simple-value int">1</span></details><details open class="pyglove contextual-attribute"><summary><div class="summary-name">z<span class="tooltip">x.z</span></div><div class="summary-title">ContextualAttribute(...)</div></summary><div class="unavailable-contextual">(not available)</div></details></div></fieldset></div></details><details open class="pyglove int"><summary><div class="summary-name">y<span class="tooltip">y</span></div><div class="summary-title">int</div></summary><span class="simple-value int">1</span></details></div></fieldset></div></details>
+        """
+    )
     self.assert_html_content(
         Foo(x=Bar('{{y}} + {{z}}'), y=1).to_html(
             enable_summary_tooltip=False,
+            collapse_level=0,
+            key_style='label',
         ),
         """
-        <details open class="pyglove foo lf-template"><summary><div class="summary_title">Foo(...)</div></summary><div class="complex_value"><div class="template-str"><span>{{x}} + {{y}} = ?</span></div><fieldset class="template-fields"><legend>Template Variables</legend><div class="complex_value foo lf-template"><table><tr><td><span class="object_key str">x</span><span class="tooltip key-path">x</span></td><td><div><details class="pyglove bar lf-template"><summary><div class="summary_title">Bar(...)</div></summary><div class="complex_value"><div class="template-str"><span>{{y}} + {{z}}</span></div><fieldset class="template-fields"><legend>Template Variables</legend><div class="complex_value bar lf-template"><table><tr><td><span class="object_key str">y</span><span class="tooltip key-path">x.y</span></td><td><div><div class="inferred-value"><span class="simple_value int">1</span></div></div></td></tr><tr><td><span class="object_key str">z</span><span class="tooltip key-path">x.z</span></td><td><div><span class="contextual-variable">(external)</span></div></td></tr></table></div></fieldset></div></details></div></td></tr><tr><td><span class="object_key str">y</span><span class="tooltip key-path">y</span></td><td><div><span class="simple_value int">1</span></div></td></tr></table></div></fieldset></div></details>
+        <details class="pyglove foo lf-template"><summary><div class="summary-title lf-template">Foo(...)</div></summary><div class="complex_value"><div class="template-str"><span>{{x}} + {{y}} = ?</span></div><fieldset class="template-fields"><legend>Template Variables</legend><div class="complex-value foo"><table><tr><td><span class="object-key str">x</span><span class="tooltip">x</span></td><td><details class="pyglove bar lf-template"><summary><div class="summary-title lf-template">Bar(...)</div></summary><div class="complex_value"><div class="template-str"><span>{{y}} + {{z}}</span></div><fieldset class="template-fields"><legend>Template Variables</legend><div class="complex-value bar"><table><tr><td><span class="object-key str">y</span><span class="tooltip">x.y</span></td><td><details open class="pyglove contextual-attribute"><summary><div class="summary-title">ContextualAttribute(...)</div></summary><span class="simple-value int">1</span></details></td></tr><tr><td><span class="object-key str">z</span><span class="tooltip">x.z</span></td><td><details open class="pyglove contextual-attribute"><summary><div class="summary-title">ContextualAttribute(...)</div></summary><div class="unavailable-contextual">(not available)</div></details></td></tr></table></div></fieldset></div></details></td></tr><tr><td><span class="object-key str">y</span><span class="tooltip">y</span></td><td><span class="simple-value int">1</span></td></tr></table></div></fieldset></div></details>
         """
     )
 

{langfun-0.1.2.dev202410140804.dist-info → langfun-0.1.2.dev202410180804.dist-info}/METADATA

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

{langfun-0.1.2.dev202410140804.dist-info → langfun-0.1.2.dev202410180804.dist-info}/RECORD

@@ -1,7 +1,7 @@
 langfun/__init__.py,sha256=mCES7t3R7Z-ZQYvG38-yrVqZubrXNfGCa8tI5HGB7mE,2274
 langfun/core/__init__.py,sha256=xlvFTXc7IKUTs8aCFRFhzOLTmmeuhXgk9yx2InBLNiA,4937
-langfun/core/component.py,sha256=nxF4UD7NLduPjrf4IAtysMAIg3IChfoQHjY77vC8f_E,10263
-langfun/core/component_test.py,sha256=q15Xn51cVTu2RKxZ9U5VQgT3bm6RQ4638bKhWBtvW5o,8220
+langfun/core/component.py,sha256=kOWdhEYlGw62CO_7aB_oAdivVhnDfyoymRXHr10VtLo,11502
+langfun/core/component_test.py,sha256=sG-T2wpvBfHqWGZE7sc4NayJj2aj5QFBzSwFiwrGEIc,10376
 langfun/core/concurrent.py,sha256=QW-LbgF555lwHYmnirYONVjpqgkn95CuQRuAErgYIIY,29598
 langfun/core/concurrent_test.py,sha256=F9kQKK0D6CHOejckFcVjCB-ThkBN8Oa4P8WV7FOhxIM,17042
 langfun/core/console.py,sha256=bk5rNPNm9rMGW5YT2HixxU04p2umnoabn5SDz6Dqe88,2317
@@ -10,11 +10,11 @@ langfun/core/langfunc.py,sha256=G50YgoVZ0y1GFw2ev41MlOqr6qa8YakbvNC0h_E0PiA,1114
 langfun/core/langfunc_test.py,sha256=KC6fU1InBxdYU5JkLgtafTWZD6Kd1qPaZRzO7sIHf9o,8787
 langfun/core/language_model.py,sha256=AwvvwoaTbN0phDJBtXOxAIW4wnmEBrBiT0DknGPdn4o,29922
 langfun/core/language_model_test.py,sha256=cgoSdKwicnvHYo-tQeTdONXAVM-bvWLzgTlqxvace-A,28424
-langfun/core/logging.py,sha256=lZdSdlMwjgVBLcYKSa1LKxIv9WYYWce0mfFlLXHxXE8,7172
-langfun/core/logging_test.py,sha256=4YkRFb-3_a3ARsIrXtjphFvvA3nU8iBNC9WTwlkYC1A,4156
+langfun/core/logging.py,sha256=2zVHV5E4vdsjxY8lFF1zZP0WQlts4LT3nXspOKqDeBs,7454
+langfun/core/logging_test.py,sha256=b5bPTSUoYeICATaO6I8dOVumodwRbxSp1Oz96Sf3KcE,6104
 langfun/core/memory.py,sha256=f-asN1F7Vehgdn_fK84v73GrEUOxRtaW934keutTKjk,2416
-langfun/core/message.py,sha256=VO36UJOB5ftuHIAYWl5eVFv1sLBv6b5t3jvtlbtJ4jE,24486
-langfun/core/message_test.py,sha256=1XTMsHt8FxS9kT2Ij3D7zPhaT8ql3Go5kLQd-tbHSEY,29296
+langfun/core/message.py,sha256=Mc-QWnP22ia-ZIKJ_9A3CZynB5sHOH7VkJm7eTDxsbM,25589
+langfun/core/message_test.py,sha256=HaJ7zB0rtB_RF8mOfXH18csIViP8_QY12GD6ZV7k3H0,32603
 langfun/core/modality.py,sha256=hC0LF8EGCU2GJxTNbfzR441oOk2-HnHnAVWbwkLG0bI,4133
 langfun/core/modality_test.py,sha256=7SwhixFME2Q1sIXRgJx97EZFiIyC31A9NVr6_nDtFv4,2441
 langfun/core/natural_language.py,sha256=3ynSnaYQnjE60LIPK5fyMgdIjubnPYZwzGq4rWPeloE,1177
@@ -25,8 +25,8 @@ langfun/core/sampling.py,sha256=SCnS5PFJWNVxSKvSkSCNRUmruvScun8UcNN4gafuXcw,5866
 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=cCGrfil3-yVPKL8Ri0p4voyZnU9tBy9mCIqnISR4lCE,25960
-langfun/core/template_test.py,sha256=Xo_8iYWRwK6actfmEkajw1ZGmmyK4DOwo0g_Ohq4ZA0,17847
+langfun/core/template.py,sha256=SpI-UvVUDRJ5HYa4fVkOvbjEwrpUjhZoNqiG2adUAwE,25339
+langfun/core/template_test.py,sha256=Qokz1hQFhRYaTZWBWGqvPJ0NXC9B9ennUpnRYHEf0hE,20542
 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
@@ -81,8 +81,8 @@ langfun/core/modalities/audio.py,sha256=qCrVCX690SG0ps-ZfOtNWvHn_CmdJsmxF7GySScW
 langfun/core/modalities/audio_test.py,sha256=yyGEBYqMXmNs_F2dEtj-PX8HE040vqh-YQppsvdxPw4,2025
 langfun/core/modalities/image.py,sha256=ovcX8NLBNv8WzxAdhQ-u4VQfHVBkWijRj_oiNwhE9lk,1768
 langfun/core/modalities/image_test.py,sha256=XMgtJXY75R5eo0CZ222D1QUy57_hESnttmCGWwDLt7k,3824
-langfun/core/modalities/mime.py,sha256=BrhS-r_1455dSCoIX5hhan9EKVapq0tnO2AFf1aYplg,7371
-langfun/core/modalities/mime_test.py,sha256=0LLptQfF71-WKStoWs3-CvWZSIRglCvgEuU_AwkN8bI,4382
+langfun/core/modalities/mime.py,sha256=jKE1eDaP46isD-IjWgfzhxnTcmQJ-b4wCoq6tury3J8,7576
+langfun/core/modalities/mime_test.py,sha256=lC99gsaTUwVkxQat9hkR3CV-1GI-QPMgwaIdf9EqnoM,4471
 langfun/core/modalities/ms_office.py,sha256=0PnM6W9SovVfJNd4XCpUfOcGBuvj4hlA1zqPjdsJNFM,3725
 langfun/core/modalities/ms_office_test.py,sha256=rrDBx51ELAqRaUX6Y6tgg0k3tEFHOlRMfUpeULD7mlo,87868
 langfun/core/modalities/pdf.py,sha256=mfaeCbUA4JslFVTARiJh8hW7imvL4tLVw9gUhO5bAZA,727
@@ -96,13 +96,13 @@ langfun/core/structured/description.py,sha256=SXW4MJvshFjbR-0gw6rE21o6WXq12UlRXa
 langfun/core/structured/description_test.py,sha256=UtZGjSFUaQ6130t1E5tcL7ODu0xIefkapb53TbnqsK8,7362
 langfun/core/structured/function_generation.py,sha256=pFgS3vcRAWiuFBol2x5Eeip3XqoudONsOpeJpWyjT3s,7479
 langfun/core/structured/function_generation_test.py,sha256=ZJI-aaGgWWszn92u7h5IZ9Pl70N2DgAGGJrIxPzsvwg,10065
-langfun/core/structured/mapping.py,sha256=gx81qwVv6nE3I7a3w7sgdIZZXLhvSgoZYqajT_fE7L8,13054
-langfun/core/structured/mapping_test.py,sha256=Oal51n0R2SMKCh7aoZnD_BYBnLLYrXE3cH_bjPu-jlY,8388
+langfun/core/structured/mapping.py,sha256=pMSvxEPqA8h7LsCMKMGG5Fcm0hyaIOTHFcoddQpn4cs,13574
+langfun/core/structured/mapping_test.py,sha256=bHm2ZCXBITq_G8Lvw_olFHeUUc4s_lGXZm9v9JhoPB4,9630
 langfun/core/structured/parsing.py,sha256=keoVqEfzAbdULh6GawWFsTQzU91MzJXYFZjXGXLaD8g,11492
 langfun/core/structured/parsing_test.py,sha256=-sYWlamAuU_tMUSEq2vDhEU6uz_9fBtQ6M6ODBAYy_I,20941
 langfun/core/structured/prompting.py,sha256=huwwh01AQQCwPBQESOMI_V1V5PZkVQ8C89Yjk67_4Uw,10677
 langfun/core/structured/prompting_test.py,sha256=pviyb8yTnxkWPAZodLIlQT8y2ScE6FfSHKWf1NUtV-Y,26718
-langfun/core/structured/schema.py,sha256=E3f49ej7XFiFd14SErcpgJI5WLm1aTLxL-PVs-UrmQE,28154
+langfun/core/structured/schema.py,sha256=UO44Gn4XbFfHmTMYdrhuC8LfGa6kwaOCAMFqBnvFNns,28156
 langfun/core/structured/schema_generation.py,sha256=U3nRQsqmMZg_qIVDh2fiY3K4JLfsAL1LcKzIFP1iXFg,5316
 langfun/core/structured/schema_generation_test.py,sha256=RM9s71kMNg2jTePwInkiW9fK1ACN37eyPeF8OII-0zw,2950
 langfun/core/structured/schema_test.py,sha256=RjYhwTgktQgyqAjzLvo967nTiIK9KWgP-aNGg4e7ihE,25258
@@ -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=Ot__1P1M8oJfoTp-M9-PQ6HUXqZKyMwvZ5f7yQ3yfyM,2326
-langfun-0.1.2.dev202410140804.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-langfun-0.1.2.dev202410140804.dist-info/METADATA,sha256=vQoMgLuof7waXcdr7z0XNkWmXXYKnN2EMahUXmxzSn8,8890
-langfun-0.1.2.dev202410140804.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-langfun-0.1.2.dev202410140804.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
-langfun-0.1.2.dev202410140804.dist-info/RECORD,,
+langfun-0.1.2.dev202410180804.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+langfun-0.1.2.dev202410180804.dist-info/METADATA,sha256=8LqnQs02H5_1Bw2RbdEdz5JMYLec6yO04lwkIMHzxE8,8890
+langfun-0.1.2.dev202410180804.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+langfun-0.1.2.dev202410180804.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
+langfun-0.1.2.dev202410180804.dist-info/RECORD,,

{langfun-0.1.2.dev202410140804.dist-info → langfun-0.1.2.dev202410180804.dist-info}/WHEEL

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