langfun 0.1.2.dev202503200804__py3-none-any.whl → 0.1.2.dev202503220803__py3-none-any.whl

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/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/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/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/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/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/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/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/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.dist-info → langfun-0.1.2.dev202503220803.dist-info}/METADATA

@@ -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.dist-info → langfun-0.1.2.dev202503220803.dist-info}/RECORD

@@ -43,7 +43,7 @@ langfun/core/coding/python/parsing_test.py,sha256=PIexYpSEhgNaSd4T6QYWzWHzm3sL4V
 langfun/core/coding/python/sandboxing.py,sha256=yeEdydMkfHk3Hj3-5ykeROpYyLbRfZ4BwGWJYvFBmSI,4001
 langfun/core/coding/python/sandboxing_test.py,sha256=H_0_pd-_uS-ci5yYhmDTR6-hyzosAFkExziAHndfdDo,2023
 langfun/core/eval/__init__.py,sha256=OEXr1ZRuvLuhJJfuQ1ZWQ-SvYzjyrtiAAEogYaB7E6o,1933
-langfun/core/eval/base.py,sha256=XXerMVkK4wREo7K1_aCyay6vDjw3mfs389XThAdzv50,75768
+langfun/core/eval/base.py,sha256=qIJnrO1jX5pzY8yoQTtcTn5lGdD9adz5U6C_jla1BV4,75806
 langfun/core/eval/base_test.py,sha256=UJBsfsXNAfZpSSI6oEF7_VxPp13SzRRLRfuCnU7a4JM,27189
 langfun/core/eval/matching.py,sha256=AVKkGoc-BaHEzgSBamaAk3194TgqckDe_dinpS6LrXI,9323
 langfun/core/eval/matching_test.py,sha256=rdawe6q3pWfKyW6Qk67b3LBN_zYTa7OfDYjl9mJj5P8,5249
@@ -51,16 +51,16 @@ langfun/core/eval/patching.py,sha256=R0s2eAd1m97exQt06dmUL0V_MBG0W2Hxg7fhNB7cXW0
 langfun/core/eval/patching_test.py,sha256=8kCd54Egjju22FMgtJuxEsrXkW8ifs-UUBHtrCG1L6w,4775
 langfun/core/eval/scoring.py,sha256=_DvnlgI1SdRVaOojao_AkV3pnenfCPOqyhvlg-Sw-5M,6322
 langfun/core/eval/scoring_test.py,sha256=adQEeuDux11dt9lkJIzLYNmqYSi9h-Mi2Cr0lUUTx9I,4546
-langfun/core/eval/v2/__init__.py,sha256=qoa6zKdFXOFyCX6vay6OdgPf1eUhYGoHYAxe35qECGk,1628
+langfun/core/eval/v2/__init__.py,sha256=9lNKJwbvl0lcFblAXYT_OHI8fOubJsTOdSkxEqsP1xU,1726
 langfun/core/eval/v2/checkpointing.py,sha256=t47rBfzGZYgIqWW1N1Ak9yQnNtHd-IRbEO0cZjG2VRo,11755
 langfun/core/eval/v2/checkpointing_test.py,sha256=NggOSJ_6XSa4cNP6nGIu9wLsK59dUwe8SPWDiXtGGDE,9197
 langfun/core/eval/v2/eval_test_helper.py,sha256=sKFi_wPYCNmr96WyTduuXY0KnxjFxcJyEhXey-_nGX8,3962
-langfun/core/eval/v2/evaluation.py,sha256=qiM1z8xLEDU1381woIkcJmFkfF2oaRKG2NrixW2UNZ0,24042
+langfun/core/eval/v2/evaluation.py,sha256=faL-G98rdGBW9hMSlzZJtkGMytBqvTZRue1k9m_BWRQ,24029
 langfun/core/eval/v2/evaluation_test.py,sha256=TKbeyeenoaUDH23E3TXXJ4otuq3VZBuWkWdV7c5vMk4,6804
 langfun/core/eval/v2/example.py,sha256=4-LNr8Ke-fhaF6gyeXX4JMyw0s8YkVTC63pXZ-CXKrE,10144
 langfun/core/eval/v2/example_test.py,sha256=1DNm6EuyZOq827DKvf3oTRVFkMNM_qTnLUpvOjpgz5I,3419
-langfun/core/eval/v2/experiment.py,sha256=qYWx22KMfoUa4ieSq1bt7NE8L9dgoiJpuNOQGT1IBQw,32723
-langfun/core/eval/v2/experiment_test.py,sha256=CqpDsDai2DiIU-SzpVmqFzM_ZxxkVYKd0Gr1Uvcvkuw,13546
+langfun/core/eval/v2/experiment.py,sha256=hHNyIw1uSV-hW2nMMx4hV-uul7KwXCmp7jAWNRyT5fU,32938
+langfun/core/eval/v2/experiment_test.py,sha256=UmCobeS6ifPcaGkTJp0WPISolXrVFbeFCBiyJeA0Lt4,13666
 langfun/core/eval/v2/metric_values.py,sha256=_B905bC-jxrYPLSEcP2M8MaHZOVMz_bVrUw8YC4arCE,4660
 langfun/core/eval/v2/metric_values_test.py,sha256=ab2oF_HsIwrSy459108ggyjgefHSPn8UVILR4dRwx14,2634
 langfun/core/eval/v2/metrics.py,sha256=bl8i6u-ZHRBz4hAc3LzsZ2Dc7ZRQcuTYeUhhH-GxfF0,10628
@@ -69,8 +69,8 @@ langfun/core/eval/v2/progress.py,sha256=azZgssQgNdv3IgjKEaQBuGI5ucFDNbdi02P4z_nQ
 langfun/core/eval/v2/progress_test.py,sha256=YU7VHzmy5knPZwj9vpBN3rQQH2tukj9eKHkuBCI62h8,2540
 langfun/core/eval/v2/progress_tracking.py,sha256=l9fEkz4oP5McpZzf72Ua7PYm3lAWtRru7gRWNf8H0ms,6083
 langfun/core/eval/v2/progress_tracking_test.py,sha256=fouMVJkFJqHjbhQJngGLGCmA9x3n0dU4USI2dY163mg,2291
-langfun/core/eval/v2/reporting.py,sha256=7rL9LLmGYnQ5HIjqRqsOMkUlBl4BmFPEL6Vlofqi2Hk,8353
-langfun/core/eval/v2/reporting_test.py,sha256=UmYSAQvD3AIXsSyWQ-WD2uLtEISYpmBeoKY5u5Qwc8E,5696
+langfun/core/eval/v2/reporting.py,sha256=yUIPCAMnp7InIzpv1DDWrcLO-75iiOUTpscj7smkfrA,8335
+langfun/core/eval/v2/reporting_test.py,sha256=hcPJJaMtPulqERvHYTpId83WXdqDKnnexmULtK7WKwk,5686
 langfun/core/eval/v2/runners.py,sha256=De4d5QQ-Tpw0nPDODQexDPy0ti-FEgzHBvfH78zqdtg,15945
 langfun/core/eval/v2/runners_test.py,sha256=A37fKK2MvAVTiShsg_laluJzJ9AuAQn52k7HPbfD0Ks,11666
 langfun/core/llms/__init__.py,sha256=F2nqEv9Cc-1QALrlPnIEp-TZiSVTi6U8WWb1YwDt1w0,8038
@@ -96,8 +96,8 @@ langfun/core/llms/openai.py,sha256=zDi-wkV-r3vUZYoTFvU1gaNNVQVQytVuZ4CvTGLsRL8,3
 langfun/core/llms/openai_compatible.py,sha256=lhq9_XLVUoGa5AIPXTbqGqWvm2P3dkHFSUQ7XnyLozw,5442
 langfun/core/llms/openai_compatible_test.py,sha256=I5WWL3lRo-WXnSoUKLkIEjXfwjoiHRX9o0dj0j09jsk,17024
 langfun/core/llms/openai_test.py,sha256=gwuO6aoa296iM2welWV9ua4KF8gEVGsEPakgbtkWkFQ,2687
-langfun/core/llms/rest.py,sha256=xdR4ar4y7YkeZTs_BHUyNOdhqoghztMcqyz1f9kTXH8,4054
-langfun/core/llms/rest_test.py,sha256=zWGiI08f9gXsoQPJS9TlX1zD2uQLrJUB-1VpAJXRHfs,3475
+langfun/core/llms/rest.py,sha256=ucMKHXlmg6pYSIMhQSktLmTSGMSIiqO8fp1r_GiEhaU,4333
+langfun/core/llms/rest_test.py,sha256=_zM7nV8DEVyoXNiQOnuwJ917mWjki0614H88rNmDboE,5020
 langfun/core/llms/vertexai.py,sha256=Cf_QeFybIF-dALxdtwy7-ElepSv1ryd6im5-NijwUGE,17646
 langfun/core/llms/vertexai_test.py,sha256=dOprP_uLNmXHYxMoX_hMPMsjKR-e_B5nKHjhlMCQoOQ,4252
 langfun/core/llms/cache/__init__.py,sha256=QAo3InUMDM_YpteNnVCSejI4zOsnjSMWKJKzkb3VY64,993
@@ -148,8 +148,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.dev202503200804.dist-info/licenses/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-langfun-0.1.2.dev202503200804.dist-info/METADATA,sha256=8BKJHx56VyQtnyzj6x5f2Ef3j9xWxauu-QRtG5pXvoI,7692
-langfun-0.1.2.dev202503200804.dist-info/WHEEL,sha256=tTnHoFhvKQHCh4jz3yCn0WPTYIy7wXx3CJtJ7SJGV7c,91
-langfun-0.1.2.dev202503200804.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
-langfun-0.1.2.dev202503200804.dist-info/RECORD,,
+langfun-0.1.2.dev202503220803.dist-info/licenses/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+langfun-0.1.2.dev202503220803.dist-info/METADATA,sha256=z8c-QQRstr1soNbtJeSrzitjRg0XSYkaDXeF01SoRpw,7692
+langfun-0.1.2.dev202503220803.dist-info/WHEEL,sha256=1tXe9gY0PYatrMPMDd6jXqjfpz_B-Wqm32CPfRC58XU,91
+langfun-0.1.2.dev202503220803.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
+langfun-0.1.2.dev202503220803.dist-info/RECORD,,

{langfun-0.1.2.dev202503200804.dist-info → langfun-0.1.2.dev202503220803.dist-info}/WHEEL

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