langfun 0.1.2.dev202410230804__py3-none-any.whl → 0.1.2.dev202410250804__py3-none-any.whl

langfun/core/concurrent.py

@@ -118,6 +118,7 @@ def with_retry(
     max_attempts: int,
     retry_interval: int | tuple[int, int] = (5, 60),
     exponential_backoff: bool = True,
+    max_retry_interval: int = 300,
     seed: int | None = None,
 ) -> Callable[..., Any]:
   """Derives a user function with retry on error.
@@ -133,6 +134,9 @@ def with_retry(
       of the tuple.
     exponential_backoff: If True, exponential wait time will be applied on top
       of the base retry interval.
+    max_retry_interval: The max retry interval in seconds. This is useful when
+      the retry interval is exponential, to avoid the wait time to grow
+      exponentially.
     seed: Random seed to generate retry interval. If None, the seed will be
       determined based on current time.
 
@@ -153,7 +157,7 @@ def with_retry(
     def next_wait_interval(attempt: int) -> float:
       if not exponential_backoff:
         attempt = 1
-      return base_interval() * (2 ** (attempt - 1))
+      return min(max_retry_interval, base_interval() * (2 ** (attempt - 1)))
 
     wait_intervals = []
     errors = []
@@ -193,6 +197,7 @@ def concurrent_execute(
     max_attempts: int = 5,
     retry_interval: int | tuple[int, int] = (5, 60),
     exponential_backoff: bool = True,
+    max_retry_interval: int = 300,
 ) -> list[Any]:
   """Executes a function concurrently under current component context.
 
@@ -213,6 +218,9 @@ def concurrent_execute(
       of the tuple.
     exponential_backoff: If True, exponential wait time will be applied on top
       of the base retry interval.
+    max_retry_interval: The max retry interval in seconds. This is useful when
+      the retry interval is exponential, to avoid the wait time to grow
+      exponentially.
 
   Returns:
     A list of ouputs. Each is the return value of `func` based on the input
@@ -225,6 +233,7 @@ def concurrent_execute(
         max_attempts=max_attempts,
         retry_interval=retry_interval,
         exponential_backoff=exponential_backoff,
+        max_retry_interval=max_retry_interval,
     )
 
   # NOTE(daiyip): when executor is not specified and max_worker is 1,

langfun/core/concurrent_test.py

@@ -138,10 +138,19 @@ class WithRetryTest(unittest.TestCase):
       raise ValueError('Intentional error.')
 
     foo_with_retry = concurrent.with_retry(
-        foo, ValueError, max_attempts=4, retry_interval=1
+        foo, ValueError, max_attempts=4, retry_interval=1,
     )
     self.assert_retry(foo_with_retry, 4, [1, 2, 4])
 
+  def test_retry_with_max_retry_interval(self):
+    def foo():
+      raise ValueError('Intentional error.')
+
+    foo_with_retry = concurrent.with_retry(
+        foo, ValueError, max_attempts=4, retry_interval=1, max_retry_interval=3,
+    )
+    self.assert_retry(foo_with_retry, 4, [1, 2, 3])
+
   def test_retry_with_uncaught_exception(self):
     def foo():
       raise ValueError('Intentional error.')

langfun/core/langfunc_test.py

@@ -108,7 +108,8 @@ class LangFuncCallTest(unittest.TestCase):
         ' max_tokens=None, n=1, top_k=40, top_p=None, stop=None,'
         ' random_seed=None, logprobs=False, top_logprobs=None), cache=None,'
         ' max_concurrency=None, timeout=120.0, max_attempts=5,'
-        ' retry_interval=(5, 60), exponential_backoff=True, debug=False))',
+        ' retry_interval=(5, 60), exponential_backoff=True,'
+        ' max_retry_interval=300, debug=False))',
     )
 
     l = LangFunc('Hello')

langfun/core/language_model.py

@@ -409,6 +409,15 @@ class LanguageModel(component.Component):
       )
   ] = True
 
+  max_retry_interval: Annotated[
+      int,
+      (
+          'The max retry interval in seconds. This is useful when the retry '
+          'interval is exponential, to avoid the wait time to grow '
+          'exponentially.'
+      )
+  ] = 300
+
   debug: Annotated[
       bool | LMDebugMode,
       (
@@ -587,6 +596,7 @@ class LanguageModel(component.Component):
         max_attempts=self.max_attempts,
         retry_interval=self.retry_interval,
         exponential_backoff=self.exponential_backoff,
+        max_retry_interval=self.max_retry_interval,
     )
 
   def __call__(

langfun/core/llms/__init__.py

@@ -90,6 +90,8 @@ from langfun.core.llms.openai import Gpt3Ada
 
 from langfun.core.llms.anthropic import Anthropic
 from langfun.core.llms.anthropic import Claude35Sonnet
+from langfun.core.llms.anthropic import Claude35Sonnet20241022
+from langfun.core.llms.anthropic import Claude35Sonnet20240620
 from langfun.core.llms.anthropic import Claude3Opus
 from langfun.core.llms.anthropic import Claude3Sonnet
 from langfun.core.llms.anthropic import Claude3Haiku

langfun/core/llms/anthropic.py

@@ -30,6 +30,13 @@ SUPPORTED_MODELS_AND_SETTINGS = {
     #     as RPM/TPM of the largest-available model (Claude-3-Opus).
     # Price in US dollars at https://www.anthropic.com/pricing
     # as of 2024-10-10.
+    'claude-3-5-sonnet-20241022': pg.Dict(
+        max_tokens=4096,
+        rpm=4000,
+        tpm=400000,
+        cost_per_1k_input_tokens=0.003,
+        cost_per_1k_output_tokens=0.015,
+    ),
     'claude-3-5-sonnet-20240620': pg.Dict(
         max_tokens=4096,
         rpm=4000,
@@ -264,6 +271,17 @@ class Claude3(Anthropic):
 
 class Claude35Sonnet(Claude3):
   """A balance between between Opus and Haiku."""
+  model = 'claude-3-5-sonnet-20241022'
+
+
+class Claude35Sonnet20241022(Claude3):
+  """A balance between between Opus and Haiku."""
+
+  model = 'claude-3-5-sonnet-20241022'
+
+
+class Claude35Sonnet20240620(Claude3):
+  """A balance between between Opus and Haiku."""
 
   model = 'claude-3-5-sonnet-20240620'
 

langfun/core/llms/vertexai_test.py

@@ -195,8 +195,12 @@ class VertexAITest(unittest.TestCase):
             stop=['\n'],
         ),
     )
+    actual = config.to_dict()
+    # There is a discrepancy between the `property_ordering` in the
+    # Google-internal version and the open-source version.
+    actual['response_schema'].pop('property_ordering', None)
     self.assertEqual(
-        config.to_dict(),
+        actual,
         dict(
             temperature=2.0,
             top_p=1.0,

langfun/core/structured/parsing.py

@@ -271,8 +271,8 @@ def call(
     return lm_output if returns_message else lm_output.text
 
   # Call `parsing_lm` for structured parsing.
-  return prompting.query(
-      lm_output,
+  parsing_message = prompting.query(
+      lm_output.text,
       schema,
       examples=parsing_examples,
       lm=parsing_lm or lm,
@@ -281,9 +281,12 @@ def call(
       autofix=autofix,
       autofix_lm=autofix_lm or lm,
       protocol=protocol,
-      returns_message=returns_message,
+      returns_message=True,
       **kwargs,
   )
+  # Chain the source of the parsed output to the LM output.
+  parsing_message.root.source = lm_output
+  return parsing_message if returns_message else parsing_message.result
 
 
 def _parse_structure_cls(

langfun/core/structured/parsing_test.py

@@ -670,6 +670,24 @@ class CallTest(unittest.TestCase):
         3,
     )
 
+  def test_call_with_parsing_message_chaining(self):
+    output = parsing.call(
+        'Compute 1 + 2',
+        int,
+        lm=fake.StaticSequence(['three']),
+        parsing_lm=fake.StaticSequence(['3']),
+        parsing_examples=[
+            mapping.MappingExample(
+                context='Multiple four and five',
+                input='twenty',
+                schema=int,
+                output=20,
+            )
+        ],
+        returns_message=True,
+    )
+    self.assertEqual(output.root.text, 'Compute 1 + 2')
+
   def test_call_with_autofix(self):
     lm = fake.StaticSequence(
         [

{langfun-0.1.2.dev202410230804.dist-info → langfun-0.1.2.dev202410250804.dist-info}/METADATA

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

{langfun-0.1.2.dev202410230804.dist-info → langfun-0.1.2.dev202410250804.dist-info}/RECORD

@@ -2,13 +2,13 @@ langfun/__init__.py,sha256=mCES7t3R7Z-ZQYvG38-yrVqZubrXNfGCa8tI5HGB7mE,2274
 langfun/core/__init__.py,sha256=xlvFTXc7IKUTs8aCFRFhzOLTmmeuhXgk9yx2InBLNiA,4937
 langfun/core/component.py,sha256=kOWdhEYlGw62CO_7aB_oAdivVhnDfyoymRXHr10VtLo,11502
 langfun/core/component_test.py,sha256=sG-T2wpvBfHqWGZE7sc4NayJj2aj5QFBzSwFiwrGEIc,10376
-langfun/core/concurrent.py,sha256=ivUwaswRrwldLRZ_p4R3TUy6XqyWY9UdJ8oo2_1Ic0s,29838
-langfun/core/concurrent_test.py,sha256=F9kQKK0D6CHOejckFcVjCB-ThkBN8Oa4P8WV7FOhxIM,17042
+langfun/core/concurrent.py,sha256=8L-fRc9x5PtrnuHJSEOPiKG4HUsQ2xWDt_1Ws1uGJRE,30324
+langfun/core/concurrent_test.py,sha256=ILlAjfhV84yJfY1QLe3N9aYry1sCjY-ywfIlXGafenI,17336
 langfun/core/console.py,sha256=bk5rNPNm9rMGW5YT2HixxU04p2umnoabn5SDz6Dqe88,2317
 langfun/core/console_test.py,sha256=5SYJdxpJGLgdSSQqqMPoA1X6jpsLD8rgcyk-EgI65oE,1077
 langfun/core/langfunc.py,sha256=G50YgoVZ0y1GFw2ev41MlOqr6qa8YakbvNC0h_E0PiA,11140
-langfun/core/langfunc_test.py,sha256=KC6fU1InBxdYU5JkLgtafTWZD6Kd1qPaZRzO7sIHf9o,8787
-langfun/core/language_model.py,sha256=AwvvwoaTbN0phDJBtXOxAIW4wnmEBrBiT0DknGPdn4o,29922
+langfun/core/langfunc_test.py,sha256=fKIAqcSNI_7M6nwoZW77HEam8Oa6vcWhsCNgVJanzb4,8822
+langfun/core/language_model.py,sha256=jOvWyiKvcv2yJGBNPWmxV8wyzuWnCcrc1FhldYBtPkE,30219
 langfun/core/language_model_test.py,sha256=cgoSdKwicnvHYo-tQeTdONXAVM-bvWLzgTlqxvace-A,28424
 langfun/core/logging.py,sha256=2zVHV5E4vdsjxY8lFF1zZP0WQlts4LT3nXspOKqDeBs,7454
 langfun/core/logging_test.py,sha256=b5bPTSUoYeICATaO6I8dOVumodwRbxSp1Oz96Sf3KcE,6104
@@ -52,8 +52,8 @@ langfun/core/eval/patching.py,sha256=R0s2eAd1m97exQt06dmUL0V_MBG0W2Hxg7fhNB7cXW0
 langfun/core/eval/patching_test.py,sha256=8kCd54Egjju22FMgtJuxEsrXkW8ifs-UUBHtrCG1L6w,4775
 langfun/core/eval/scoring.py,sha256=SUdMzOkP0n2qGaSuUA4VwFiTw36jgMvgCJHPJS4yYDw,6254
 langfun/core/eval/scoring_test.py,sha256=O8olHbrUEg60gMxwOkWzKBJZpZoUlmVnBANX5Se2SXM,4546
-langfun/core/llms/__init__.py,sha256=baM-YFySnOyijgmMjv1mKPYDvdlny2Md2aZ5bWyxPfc,5859
-langfun/core/llms/anthropic.py,sha256=zPisDmmt6zq-U6hEnoSgReXujmmAj7VGs4KHgzcw1EU,8976
+langfun/core/llms/__init__.py,sha256=SFa3qKHSq_P_bV_SkIEVasm58J6wvwLVeoh0rhhDy9o,5985
+langfun/core/llms/anthropic.py,sha256=aPZkxesbbGhDCs3eTvyyGrScvXgQO6Tgl4BVgxLXjOY,9431
 langfun/core/llms/anthropic_test.py,sha256=T-swuMkfnlgs8Fpif4rtXs579exGk0TsbLMirXDZCkg,5533
 langfun/core/llms/fake.py,sha256=gCHBYBLvBCsC78HI1hpoqXCS-p1FMTgY1P1qh_sGBPk,3070
 langfun/core/llms/fake_test.py,sha256=2h13qkwEz_JR0mtUDPxdAhQo7MueXaFSwsD2DIRDW9g,7653
@@ -68,7 +68,7 @@ langfun/core/llms/openai_test.py,sha256=_8cd3VRNEUfE0-Ko1RiM6MlC5hjalRj7nYTJNhG1
 langfun/core/llms/rest.py,sha256=laopuq-zD8V-3Y6eFDngftHEbE66VlUkCD2-rvvRaLU,3388
 langfun/core/llms/rest_test.py,sha256=NZ3Nf0XQVpT9kLP5cBVo_yBHLI7vWTYhWQxYEJVMGs4,3472
 langfun/core/llms/vertexai.py,sha256=eUFU0JjgpTVCAvQVEWiGqZrlE3Dye-EkzZCF1P8nwc4,18866
-langfun/core/llms/vertexai_test.py,sha256=EPR-mB2hNUpvpf7E8m_k5bh04epdQTVUuYU6hPgZyu8,10321
+langfun/core/llms/vertexai_test.py,sha256=7uBVOF5VF86xQ9HFAbSTh4J-0NjYLnuotBS1YRm-vgw,10529
 langfun/core/llms/cache/__init__.py,sha256=QAo3InUMDM_YpteNnVCSejI4zOsnjSMWKJKzkb3VY64,993
 langfun/core/llms/cache/base.py,sha256=rt3zwmyw0y9jsSGW-ZbV1vAfLxQ7_3AVk0l2EySlse4,3918
 langfun/core/llms/cache/in_memory.py,sha256=l6b-iU9OTfTRo9Zmg4VrQIuArs4cCJDOpXiEpvNocjo,5004
@@ -98,8 +98,8 @@ langfun/core/structured/function_generation.py,sha256=pFgS3vcRAWiuFBol2x5Eeip3Xq
 langfun/core/structured/function_generation_test.py,sha256=ZJI-aaGgWWszn92u7h5IZ9Pl70N2DgAGGJrIxPzsvwg,10065
 langfun/core/structured/mapping.py,sha256=pMSvxEPqA8h7LsCMKMGG5Fcm0hyaIOTHFcoddQpn4cs,13574
 langfun/core/structured/mapping_test.py,sha256=bHm2ZCXBITq_G8Lvw_olFHeUUc4s_lGXZm9v9JhoPB4,9630
-langfun/core/structured/parsing.py,sha256=keoVqEfzAbdULh6GawWFsTQzU91MzJXYFZjXGXLaD8g,11492
-langfun/core/structured/parsing_test.py,sha256=-sYWlamAuU_tMUSEq2vDhEU6uz_9fBtQ6M6ODBAYy_I,20941
+langfun/core/structured/parsing.py,sha256=zwzXh_E6yp6CzSY-0-tjqjVUiSO8wohNQedpjhDbnoE,11671
+langfun/core/structured/parsing_test.py,sha256=i0i090FVgM8ngGqYjds0hjEm1v7q4gv18k-z1kaNr7E,21467
 langfun/core/structured/prompting.py,sha256=huwwh01AQQCwPBQESOMI_V1V5PZkVQ8C89Yjk67_4Uw,10677
 langfun/core/structured/prompting_test.py,sha256=pviyb8yTnxkWPAZodLIlQT8y2ScE6FfSHKWf1NUtV-Y,26718
 langfun/core/structured/schema.py,sha256=UO44Gn4XbFfHmTMYdrhuC8LfGa6kwaOCAMFqBnvFNns,28156
@@ -119,8 +119,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.dev202410230804.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-langfun-0.1.2.dev202410230804.dist-info/METADATA,sha256=9vUS2Dv_sxeEb7DZ9btw1f54c33gHjHJZGPzOZth2Z8,8890
-langfun-0.1.2.dev202410230804.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-langfun-0.1.2.dev202410230804.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
-langfun-0.1.2.dev202410230804.dist-info/RECORD,,
+langfun-0.1.2.dev202410250804.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+langfun-0.1.2.dev202410250804.dist-info/METADATA,sha256=tYKkpmIIXhUO6f3i6uUr5FfkVYrme8O3WtbNCD6YkqY,8890
+langfun-0.1.2.dev202410250804.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
+langfun-0.1.2.dev202410250804.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
+langfun-0.1.2.dev202410250804.dist-info/RECORD,,