langfun 0.1.2.dev202409230804__py3-none-any.whl → 0.1.2.dev202409250804__py3-none-any.whl

langfun/core/eval/base.py

@@ -215,6 +215,7 @@ class Evaluable(lf.Component):
       summary: bool = True,
       pivot_field: str = 'lm',
       from_root: bool = True,
+      timeout: int | None = None,
       **kwargs,
   ) -> Union['Summary', pg.Dict]:
     """Run the evaluation, which fills and returns the result."""
@@ -265,6 +266,7 @@ class Evaluable(lf.Component):
             verbose=verbose,
             progress_bar=progress_bar,
             label=label,
+            timeout=timeout,
             **kwargs,
         )
 
@@ -398,6 +400,7 @@ class Evaluable(lf.Component):
       verbose: bool,
       progress_bar: int | None,
       label: str | None,
+      timeout: int | None = None,
       **kwargs,
   ) -> None:
     """Run the evaluate and fill `self.result`. Subclass to implement."""
@@ -1106,6 +1109,7 @@ class Evaluation(Evaluable):
       verbose: bool,
       progress_bar: int | None,
       label: str | None,
+      timeout: int | None = None,
       **kwargs,
   ) -> None:
     # Setup examples.
@@ -1136,6 +1140,7 @@ class Evaluation(Evaluable):
             max_workers=self.max_workers,
             show_progress=progress_bar or False,
             status_fn=self._status,
+            timeout=timeout,
         ):
           if error is not None:
             message = (

langfun/core/eval/matching.py

@@ -266,20 +266,27 @@ class Matching(base.Evaluation):
         '<td>Prompt/Response Chain</td>'
         '</tr>'
     )
+    def _maybe_html(v, root_indent: int):
+      del root_indent
+      if hasattr(v, '_repr_html_'):
+        return v._repr_html_()  # pylint: disable=protected-access
+      # Fall back to the default format.
+      return None
+
     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 = lf.repr_utils.escape_quoted(
           pg.format(
               example, verbose=False, max_bytes_len=32,
-              custom_format='_repr_html_'
+              custom_format=_maybe_html
           )
       )
       s.write(f'<td style="color:green;white-space:pre-wrap">{input_str}</td>')
       output_str = lf.repr_utils.escape_quoted(
           pg.format(
               output, verbose=False, max_bytes_len=32,
-              custom_format='_repr_html_'
+              custom_format=_maybe_html
           )
       )
       s.write(f'<td style="color:blue;white-space:pre-wrap">{output_str}</td>')

langfun/core/llms/vertexai.py

@@ -237,6 +237,8 @@ class VertexAI(lf.LanguageModel):
     # API. We should revisit this later.
     retry_on_errors = [
         (Exception, 'InternalServerError'),
+        (Exception, 'ResourceExhausted'),
+        (Exception, '_InactiveRpcError'),
         (
             Exception,
             (
@@ -247,11 +249,9 @@ class VertexAI(lf.LanguageModel):
         (Exception, 'ValueError: Cannot get the Candidate text.'),
     ]
 
-    return lf.concurrent_execute(
+    return self._parallel_execute_with_currency_control(
         self._sample_single,
         prompts,
-        executor=self.resource_id,
-        max_workers=self.max_concurrency,
         retry_on_errors=retry_on_errors,
     )
 

langfun/core/modality.py

@@ -49,6 +49,13 @@ class Modality(component.Component):
       return super().format(*args, **kwargs)
     return Modality.text_marker(self.referred_name)
 
+  def __str_kwargs__(self) -> dict[str, Any]:
+    # For modality objects, we don't want to use markdown format when they
+    # are rendered as parts of the prompt.
+    kwargs = super().__str_kwargs__()
+    kwargs.pop('markdown', None)
+    return kwargs
+
   @abc.abstractmethod
   def to_bytes(self) -> bytes:
     """Returns content in bytes."""

langfun/core/repr_utils.py

@@ -121,8 +121,15 @@ def html_repr(
   s.write('<table style="border-top: 1px solid #EEEEEE;">')
   item_color = item_color or (lambda k, v: (None, '#F1C40F', None, None))
 
-  with (pg.str_format(custom_format='_repr_html_'),
-        pg.repr_format(custom_format='_repr_html_')):
+  def maybe_html_format(v: Any, root_indent: int) -> str | None:
+    del root_indent
+    if hasattr(v, '_repr_html_'):
+      return v._repr_html_()  # pylint: disable=protected-access
+    # Fall back to the default format.
+    return None
+
+  with (pg.str_format(custom_format=maybe_html_format),
+        pg.repr_format(custom_format=maybe_html_format)):
     for k, v in pg.object_utils.flatten(value).items():
       if isinstance(v, pg.Ref):
         v = v.value

{langfun-0.1.2.dev202409230804.dist-info → langfun-0.1.2.dev202409250804.dist-info}/METADATA

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

{langfun-0.1.2.dev202409230804.dist-info → langfun-0.1.2.dev202409250804.dist-info}/RECORD

@@ -15,11 +15,11 @@ langfun/core/logging_test.py,sha256=poSsNGKi6G9LWOcWnTY0BQjj0BtaQknH-NK6FcQrVT4,
 langfun/core/memory.py,sha256=f-asN1F7Vehgdn_fK84v73GrEUOxRtaW934keutTKjk,2416
 langfun/core/message.py,sha256=7UOxNMA1Le0ZGkleryqwXcWojZ-l_hku5Sc58BsIOGw,18586
 langfun/core/message_test.py,sha256=2o4WvE-WL67OsVY-O5g__67OIJ73vvg6MuojSc2uVRs,12504
-langfun/core/modality.py,sha256=g9wGx347oVofAJlMu_CpzTMIyTT9DJW8NfO4E-d-oNM,3879
+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
 langfun/core/natural_language_test.py,sha256=LHGU_1ytbkGuSZQFIFP7vP3dBlcY4-A12fT6dbjUA0E,1424
-langfun/core/repr_utils.py,sha256=S2aZQllHuy2syduFiYKJm--GPoJWRGS5cXvbC1pdEUs,6243
+langfun/core/repr_utils.py,sha256=yyc2xeK8sKQOOLcxwIV9E50Wf-B0TjXrnS07tSx_ea8,6491
 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
@@ -44,9 +44,9 @@ langfun/core/coding/python/parsing_test.py,sha256=9vAWF484kWIm6JZq8NFiMgKUDhXV-d
 langfun/core/coding/python/permissions.py,sha256=1QWGHvzL8MM0Ok_auQ9tURqZHtdOfJaDpBzZ29GUE-c,2544
 langfun/core/coding/python/permissions_test.py,sha256=w5EDb8QxpxgJyZkojyzVWQvDfg366zn99-g__6TbPQ0,2699
 langfun/core/eval/__init__.py,sha256=Ogdr9OtTywhhLPHi3AZzOD2mXX2oyaHWflrSTMm96uA,1899
-langfun/core/eval/base.py,sha256=xDZQ3lu5oJaPDZCE5-QbBEajq--HRU64GVKb3xB64aI,74738
+langfun/core/eval/base.py,sha256=4GX9kBbgzNPxa5G9n_b6tYSMqz4qFEdio-FMdd3q68A,74898
 langfun/core/eval/base_test.py,sha256=iL-EEGnBD_HigClBwo34HVyOycupgw9r4S61eIZMShI,26929
-langfun/core/eval/matching.py,sha256=124Y6pCb4fDmhICH728aeROZ6nNFitKyV6FFLklCe1k,9840
+langfun/core/eval/matching.py,sha256=8p1W_sA0I3XpRgw7Rf8Jbko_Ym-JAALeM2wpSmu4jKQ,10063
 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
@@ -67,7 +67,7 @@ langfun/core/llms/openai.py,sha256=vnDrKuD-pli0AtDIDq_TmlltOk7z7_PQ-xpU4K1ARdU,1
 langfun/core/llms/openai_test.py,sha256=UcBFW_7RkkMEo47Tn5RuVRK_DryTN7bb9ITphlzthE8,17762
 langfun/core/llms/rest.py,sha256=laopuq-zD8V-3Y6eFDngftHEbE66VlUkCD2-rvvRaLU,3388
 langfun/core/llms/rest_test.py,sha256=NZ3Nf0XQVpT9kLP5cBVo_yBHLI7vWTYhWQxYEJVMGs4,3472
-langfun/core/llms/vertexai.py,sha256=mEQVwO3Kf3rGRmsI-qKrV6vg0hYy6OH1lEVOM81cb3U,15134
+langfun/core/llms/vertexai.py,sha256=hQR8eghtvPCH9l4fvuFkfV51UOiACH705Le5bmwEBDc,15164
 langfun/core/llms/vertexai_test.py,sha256=EPR-mB2hNUpvpf7E8m_k5bh04epdQTVUuYU6hPgZyu8,10321
 langfun/core/llms/cache/__init__.py,sha256=QAo3InUMDM_YpteNnVCSejI4zOsnjSMWKJKzkb3VY64,993
 langfun/core/llms/cache/base.py,sha256=rt3zwmyw0y9jsSGW-ZbV1vAfLxQ7_3AVk0l2EySlse4,3918
@@ -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.dev202409230804.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-langfun-0.1.2.dev202409230804.dist-info/METADATA,sha256=volNIPva2x4lyFLL7h_HCv0bBiBOiAxhYcdGmvfdJUc,8890
-langfun-0.1.2.dev202409230804.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
-langfun-0.1.2.dev202409230804.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
-langfun-0.1.2.dev202409230804.dist-info/RECORD,,
+langfun-0.1.2.dev202409250804.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+langfun-0.1.2.dev202409250804.dist-info/METADATA,sha256=lsO6y55zp6NzVTsJAUkn_Zb6n6G8Hh7Zt-sOIykhNmk,8890
+langfun-0.1.2.dev202409250804.dist-info/WHEEL,sha256=GV9aMThwP_4oNCtvEC2ec3qUYutgWeAzklro_0m4WJQ,91
+langfun-0.1.2.dev202409250804.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
+langfun-0.1.2.dev202409250804.dist-info/RECORD,,