langfun 0.1.2.dev202503200804__tar.gz → 0.1.2.dev202503220803__tar.gz

{langfun-0.1.2.dev202503200804 → langfun-0.1.2.dev202503220803}/PKG-INFO

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

{langfun-0.1.2.dev202503200804 → langfun-0.1.2.dev202503220803}/langfun/core/eval/base.py

@@ -77,6 +77,7 @@ class Evaluable(lf.Component):
 
   @classmethod
   def link(cls, path: str) -> str:
+    assert path.startswith('/'), path
     return f'file://{path}'
 
   @property

{langfun-0.1.2.dev202503200804 → langfun-0.1.2.dev202503220803}/langfun/core/eval/v2/__init__.py

@@ -28,6 +28,8 @@ from langfun.core.eval.v2.metric_values import Average
 from langfun.core.eval.v2.metrics import Metric
 from langfun.core.eval.v2 import metrics
 
+from langfun.core.eval.v2.experiment import Run
+from langfun.core.eval.v2.experiment import RunId
 from langfun.core.eval.v2.experiment import Plugin
 from langfun.core.eval.v2.experiment import Runner
 from langfun.core.eval.v2 import runners

{langfun-0.1.2.dev202503200804 → langfun-0.1.2.dev202503220803}/langfun/core/eval/v2/evaluation.py

@@ -425,7 +425,7 @@ class Evaluation(experiment_lib.Experiment):
                   [
                       pg.views.html.controls.Label(
                           'Summary',
-                          link=run.experiment.output_link(run, 'summary.html'),
+                          link=run.output_link('summary.html'),
                           css_classes=['summary-link'],
                       ),
                       '|',
@@ -571,7 +571,7 @@ class Evaluation(experiment_lib.Experiment):
             pg.Html.element(
                 'iframe', [],
                 name='example-view',
-                src='./1.html',
+                src='about:blank',
                 title='Example view.',
                 css_classes=['example-view'],
             ),

{langfun-0.1.2.dev202503200804 → langfun-0.1.2.dev202503220803}/langfun/core/eval/v2/experiment.py

@@ -276,6 +276,7 @@ class Experiment(lf.Component, pg.views.HtmlTreeView.Extension):
 
   @classmethod
   def link(cls, path: str) -> str:
+    assert path.startswith('/'), path
     return f'file://{path}'
 
   #
@@ -887,6 +888,10 @@ class Run(pg.Object, pg.views.html.HtmlTreeView.Extension):
       return os.path.join(self.output_root, experiment.id.replace('@', '/'))
     return self.output_root
 
+  def output_link(self, relative_path: str):
+    """Returns the output link for the relative path."""
+    return Experiment.link(os.path.join(self.output_root, relative_path))
+
   def input_dir(self, experiment: Experiment) -> str:
     """Returns the input directory of the experiment."""
     if experiment.is_leaf:

{langfun-0.1.2.dev202503200804 → langfun-0.1.2.dev202503220803}/langfun/core/eval/v2/experiment_test.py

@@ -218,6 +218,10 @@ class RunTest(unittest.TestCase):
     )
     self.assertEqual(run.output_root, '/root/run_20241102_0')
     self.assertEqual(run.input_root, '/root/run_20241102_0')
+    self.assertEqual(
+        run.output_link('summary.html'),
+        'file:///root/run_20241102_0/summary.html'
+    )
     self.assertEqual(
         run.output_dir(run.experiment.leaf_nodes[0]),
         (

{langfun-0.1.2.dev202503200804 → langfun-0.1.2.dev202503220803}/langfun/core/eval/v2/reporting.py

@@ -13,6 +13,7 @@
 # limitations under the License.
 """Reporting evaluation results."""
 
+import os
 import threading
 import time
 import traceback
@@ -145,9 +146,7 @@ class HtmlReporter(experiment_lib.Plugin):
           )
       )
       with self._summary_lock:
-        html.save(
-            run.output_path_for(run.experiment, _SUMMARY_FILE)
-        )
+        html.save(os.path.join(run.output_root, _SUMMARY_FILE))
 
     if force or (time.time() - self._last_summary_time > self.summary_interval):
       self._last_summary_time = time.time()

{langfun-0.1.2.dev202503200804 → langfun-0.1.2.dev202503220803}/langfun/core/eval/v2/reporting_test.py

@@ -31,7 +31,7 @@ class ReportingTest(unittest.TestCase):
     reporter = reporting.HtmlReporter()
     run = experiment.run(root_dir, 'new', plugins=[checkpointer, reporter])
     self.assertTrue(
-        pg.io.path_exists(run.output_path_for(experiment, 'summary.html'))
+        pg.io.path_exists(os.path.join(run.output_root, 'summary.html'))
     )
     for leaf in experiment.leaf_nodes:
       self.assertTrue(
@@ -56,7 +56,7 @@ class ReportingTest(unittest.TestCase):
         warm_start_from=run.output_root
     )
     self.assertTrue(
-        pg.io.path_exists(run.output_path_for(experiment, 'summary.html'))
+        pg.io.path_exists(os.path.join(run.output_root, 'summary.html'))
     )
     for leaf in experiment.leaf_nodes:
       self.assertTrue(
@@ -83,7 +83,7 @@ class ReportingTest(unittest.TestCase):
     reporter = reporting.HtmlReporter()
     run = experiment.run(root_dir, 'new', plugins=[reporter])
     self.assertFalse(
-        pg.io.path_exists(run.output_path_for(experiment, 'summary.html'))
+        pg.io.path_exists(os.path.join(run.output_root, 'summary.html'))
     )
     for leaf in experiment.leaf_nodes:
       self.assertFalse(
@@ -107,7 +107,7 @@ class ReportingTest(unittest.TestCase):
     reporter = reporting.HtmlReporter()
     run = experiment.run(root_dir, 'new', plugins=[checkpointer, reporter])
     self.assertTrue(
-        pg.io.path_exists(run.output_path_for(experiment, 'summary.html'))
+        pg.io.path_exists(os.path.join(run.output_root, 'summary.html'))
     )
     for leaf in experiment.leaf_nodes:
       self.assertTrue(
@@ -136,7 +136,7 @@ class ReportingTest(unittest.TestCase):
         warm_start_from=run.output_root
     )
     self.assertTrue(
-        pg.io.path_exists(run.output_path_for(experiment, 'summary.html'))
+        pg.io.path_exists(os.path.join(run.output_root, 'summary.html'))
     )
     for leaf in experiment.leaf_nodes:
       self.assertTrue(

{langfun-0.1.2.dev202503200804 → langfun-0.1.2.dev202503220803}/langfun/core/llms/rest.py

@@ -89,11 +89,21 @@ class REST(lf.LanguageModel):
                 timeout=self.timeout,
             )
         )
-    except (requests.exceptions.ReadTimeout,
-            requests.exceptions.ConnectTimeout) as e:
+    except (
+        requests.exceptions.Timeout,
+        requests.exceptions.ReadTimeout,
+        requests.exceptions.ConnectTimeout,
+        TimeoutError,
+    ) as e:
       raise lf.TemporaryLMError(str(e)) from e
-    except ConnectionError as e:
-      raise lf.LMError(str(e)) from e
+    except (
+        requests.exceptions.ConnectionError,
+        ConnectionError,
+    ) as e:
+      error_message = str(e)
+      if 'REJECTED_CLIENT_THROTTLED' in error_message:
+        raise lf.TemporaryLMError(error_message) from e
+      raise lf.LMError(error_message) from e
 
   def _error(self, status_code: int, content: str) -> lf.LMError:
     if status_code == 429:

{langfun-0.1.2.dev202503200804 → langfun-0.1.2.dev202503220803}/langfun/core/llms/rest_test.py

@@ -38,6 +38,13 @@ def mock_requests_post(url: str, json: dict[str, Any], **kwargs):
   return response
 
 
+def mock_requests_post_exception(error):
+  def _mock_requests(url: str, json: dict[str, Any], **kwargs):
+    del url, json, kwargs
+    raise error
+  return _mock_requests
+
+
 def mock_requests_post_error(status_code, error_type, error_message):
   def _mock_requests(url: str, json: dict[str, Any], **kwargs):
     del url, json, kwargs
@@ -106,6 +113,50 @@ class RestTest(unittest.TestCase):
         ):
           self._lm('hello', max_attempts=1)
 
+    for error, expected_lm_error_cls, expected_lm_error_msg in [
+        (
+            requests.exceptions.Timeout('Timeout.'),
+            lf.TemporaryLMError,
+            'Timeout.',
+        ),
+        (
+            requests.exceptions.ReadTimeout('Read timeout.'),
+            lf.TemporaryLMError,
+            'Read timeout.',
+        ),
+        (
+            requests.exceptions.ConnectTimeout('Connect timeout.'),
+            lf.TemporaryLMError,
+            'Connect timeout.',
+        ),
+        (
+            TimeoutError('Timeout error.'),
+            lf.TemporaryLMError,
+            'Timeout error.',
+        ),
+        (
+            requests.exceptions.ConnectionError('REJECTED_CLIENT_THROTTLED'),
+            lf.TemporaryLMError,
+            'REJECTED_CLIENT_THROTTLED',
+        ),
+        (
+            requests.exceptions.ConnectionError('Connection error.'),
+            lf.LMError,
+            'Connection error.',
+        ),
+        (
+            ConnectionError('Connection error.'),
+            lf.LMError,
+            'Connection error.',
+        )
+    ]:
+      with mock.patch('requests.Session.post') as mock_post:
+        mock_post.side_effect = mock_requests_post_exception(error)
+        with self.assertRaisesRegex(
+            expected_lm_error_cls, expected_lm_error_msg
+        ):
+          self._lm._sample_single(lf.UserMessage('hello'))
+
 
 if __name__ == '__main__':
   unittest.main()

{langfun-0.1.2.dev202503200804 → langfun-0.1.2.dev202503220803}/langfun.egg-info/PKG-INFO

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