langfun 0.1.2.dev202409230804__tar.gz → 0.1.2.dev202409250804__tar.gz

{langfun-0.1.2.dev202409230804 → langfun-0.1.2.dev202409250804}/PKG-INFO

@@ -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 → langfun-0.1.2.dev202409250804}/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-0.1.2.dev202409230804 → langfun-0.1.2.dev202409250804}/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-0.1.2.dev202409230804 → langfun-0.1.2.dev202409250804}/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-0.1.2.dev202409230804 → langfun-0.1.2.dev202409250804}/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-0.1.2.dev202409230804 → langfun-0.1.2.dev202409250804}/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 → langfun-0.1.2.dev202409250804}/langfun.egg-info/PKG-INFO

@@ -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