langfun 0.1.2.dev202503200804__tar.gz → 0.1.2.dev202503210804__tar.gz

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

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

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

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