langfun 0.0.2.dev20240522__py3-none-any.whl → 0.0.2.dev20240523__py3-none-any.whl

langfun/core/llms/vertexai.py

@@ -160,14 +160,16 @@ class VertexAI(lf.LanguageModel):
 
   def _sample(self, prompts: list[lf.Message]) -> list[lf.LMSamplingResult]:
     assert self._api_initialized, 'Vertex AI API is not initialized.'
+    # TODO(yifenglu): It seems this exception is due to the instability of the
+    # API. We should revisit this later.
+    retry_on_errors = [(Exception, 'InternalServerError')]
+
     return lf.concurrent_execute(
         self._sample_single,
         prompts,
         executor=self.resource_id,
         max_workers=self.max_concurrency,
-        # NOTE(daiyip): Vertex has its own policy on handling
-        # with rate limit, so we do not retry on errors.
-        retry_on_errors=None,
+        retry_on_errors=retry_on_errors,
     )
 
   def _sample_single(self, prompt: lf.Message) -> lf.LMSamplingResult:

langfun/core/structured/schema.py

@@ -262,7 +262,7 @@ def class_dependencies(
         _fill_dependencies(elem.value, include_subclasses)
     elif isinstance(vs, pg.typing.Dict) and vs.schema:
       for v in vs.schema.values():
-        _fill_dependencies(v, include_subclasses)
+        _fill_dependencies(v.value, include_subclasses)
     elif isinstance(vs, pg.typing.Union):
       for v in vs.candidates:
         _fill_dependencies(v, include_subclasses)
@@ -508,6 +508,9 @@ def annotation(
       x = '{' + kv_str + '}'
       if strict:
         x = f'pg.typing.Dict({x})'
+    elif vs.schema and vs.schema.dynamic_field:
+      v = annotation(vs.schema.dynamic_field.value, strict=strict)
+      x = f'dict[str, {v}]'
     else:
       x = 'dict[str, Any]'
 

langfun/core/structured/schema_test.py

@@ -260,15 +260,18 @@ class ClassDependenciesTest(unittest.TestCase):
     class A(pg.Object):
       foo: tuple[Foo, int]
 
+    class B(pg.Object):
+      pass
+
     class X(pg.Object):
-      k: int
+      k: dict[str, B]
 
-    class B(A):
+    class C(A):
       bar: Bar
       foo2: Foo | X
 
     a = A(foo=(Foo(1), 0))
-    self.assertEqual(schema_lib.class_dependencies(a), [Foo, A, Bar, X, B])
+    self.assertEqual(schema_lib.class_dependencies(a), [Foo, A, Bar, B, X, C])
 
     self.assertEqual(schema_lib.class_dependencies(1), [])
 
@@ -395,6 +398,15 @@ class SchemaPythonReprTest(unittest.TestCase):
         'dict[str, Any]',
         strict=False,
     )
+
+    class DictValue(pg.Object):
+      pass
+
+    self.assert_annotation(
+        pg.typing.Dict([(pg.typing.StrKey(), DictValue)]),
+        'dict[str, DictValue]',
+        strict=False,
+    )
     self.assert_annotation(
         pg.typing.Dict(),
         'dict[str, Any]',

{langfun-0.0.2.dev20240522.dist-info → langfun-0.0.2.dev20240523.dist-info}/METADATA

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

{langfun-0.0.2.dev20240522.dist-info → langfun-0.0.2.dev20240523.dist-info}/RECORD

@@ -61,7 +61,7 @@ langfun/core/llms/llama_cpp.py,sha256=Y_KkMUf3Xfac49koMUtUslKl3h-HWp3-ntq7Jaa3bd
 langfun/core/llms/llama_cpp_test.py,sha256=ZxC6defGd_HX9SFRU9U4cJiQnBKundbOrchbXuC1Z2M,1683
 langfun/core/llms/openai.py,sha256=IN46gIqfY6aEEfxCPNmyH1hrep3oWBhJDwVFilfqNkM,13657
 langfun/core/llms/openai_test.py,sha256=asSA1sVy_7hnXioD_2HTxtSDpVTKBUO_EjZuyHpwbn0,14854
-langfun/core/llms/vertexai.py,sha256=tOhaiiam1zELOuQ7q4P2Q-V0dsWEf29GOI0B-JyEVI0,9563
+langfun/core/llms/vertexai.py,sha256=V_-dUUQAPWXff5kWt9qOWJNrigy2jQL_bRVbaz8w6hg,9635
 langfun/core/llms/vertexai_test.py,sha256=1u813e2esr8HVbOpLTOhIgzaX-GqCRTBouJ1doRn80Q,7642
 langfun/core/llms/cache/__init__.py,sha256=QAo3InUMDM_YpteNnVCSejI4zOsnjSMWKJKzkb3VY64,993
 langfun/core/llms/cache/base.py,sha256=cFfYvOIUae842pncqCAsRvqXCk2AnAsRYVx0mcIoAeY,3338
@@ -90,10 +90,10 @@ langfun/core/structured/parsing.py,sha256=keoVqEfzAbdULh6GawWFsTQzU91MzJXYFZjXGX
 langfun/core/structured/parsing_test.py,sha256=34wDrXaQ-EYhJLfDL8mX9K53oQMSzh5pVYdKjnESmK8,20895
 langfun/core/structured/prompting.py,sha256=cswl9c93edsYnXsZQmMzPpmqOuKnBzbgebTYBbSxwzo,8815
 langfun/core/structured/prompting_test.py,sha256=rddf5qHN8Gm_JaNMmytwiVEBm-eZVJFLQO4GljUgR44,21700
-langfun/core/structured/schema.py,sha256=Zy9y6Vq9DrFwcuP5o5VL_PvMCmzavF-nuDqyviBnaxk,25818
+langfun/core/structured/schema.py,sha256=HDb6N7zB4z83kUYW4-ic84QgIHKpR4LZCivMeALDBVo,25967
 langfun/core/structured/schema_generation.py,sha256=U3nRQsqmMZg_qIVDh2fiY3K4JLfsAL1LcKzIFP1iXFg,5316
 langfun/core/structured/schema_generation_test.py,sha256=RM9s71kMNg2jTePwInkiW9fK1ACN37eyPeF8OII-0zw,2950
-langfun/core/structured/schema_test.py,sha256=NgQK1zGSliZVx_Af6gDBTqQxXRHvmAvGARv4dUs8IbI,23078
+langfun/core/structured/schema_test.py,sha256=S32-fo8HblYAiGoy7zsmQrbO_P-dypaYVsH7RNPLOog,23318
 langfun/core/structured/scoring.py,sha256=QyT1S8FkLtKICfUbh4AXoKK3YJ_rgejyk6TI2OtOa68,2751
 langfun/core/structured/scoring_test.py,sha256=39_dw6p_FkoqeUccO67yIqos-MccAWezoozS21i8mi0,1732
 langfun/core/templates/__init__.py,sha256=bO0eMsVJbi7sxEB2YlInKRQ2EVP-RyyKUwcD-8msuN4,927
@@ -105,8 +105,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=DYVrkk7uNKCqJGEHH31HssU2BPuMItU1vJLzfcXIlYg,2156
-langfun-0.0.2.dev20240522.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-langfun-0.0.2.dev20240522.dist-info/METADATA,sha256=RKvADXja1HiFMDOiogNo4itCqJjah6ysTsN3dTQfcwY,3452
-langfun-0.0.2.dev20240522.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-langfun-0.0.2.dev20240522.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
-langfun-0.0.2.dev20240522.dist-info/RECORD,,
+langfun-0.0.2.dev20240523.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+langfun-0.0.2.dev20240523.dist-info/METADATA,sha256=_zsZALQcxxtvtRy3cH2uXRwpjUs3h-JwZ3BUR7t7HLw,3452
+langfun-0.0.2.dev20240523.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+langfun-0.0.2.dev20240523.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
+langfun-0.0.2.dev20240523.dist-info/RECORD,,