langfun 0.0.2.dev20240522__tar.gz → 0.0.2.dev20240523__tar.gz

{langfun-0.0.2.dev20240522 → langfun-0.0.2.dev20240523}/PKG-INFO

@@ -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 → langfun-0.0.2.dev20240523}/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-0.0.2.dev20240522 → langfun-0.0.2.dev20240523}/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-0.0.2.dev20240522 → langfun-0.0.2.dev20240523}/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 → langfun-0.0.2.dev20240523}/langfun.egg-info/PKG-INFO

@@ -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