langfun 0.1.2.dev202409220803__tar.gz → 0.1.2.dev202409240804__tar.gz

{langfun-0.1.2.dev202409220803 → langfun-0.1.2.dev202409240804}/PKG-INFO

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

{langfun-0.1.2.dev202409220803 → langfun-0.1.2.dev202409240804}/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.dev202409220803 → langfun-0.1.2.dev202409240804}/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.dev202409220803 → langfun-0.1.2.dev202409240804}/langfun.egg-info/PKG-INFO

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