langfun 0.1.2.dev202409110804__py3-none-any.whl → 0.1.2.dev202409120804__py3-none-any.whl

langfun/core/component.py

@@ -73,7 +73,7 @@ class Component(pg.Object):
         field.value.set_default(attr_value)
         additional_fields.append(field)
     if additional_fields:
-      pg.symbolic.update_schema(cls, additional_fields)
+      cls.update_schema(additional_fields)
 
   def _on_bound(self):
     super()._on_bound()

langfun/core/eval/base.py

@@ -941,7 +941,7 @@ class Evaluation(Evaluable):
 
     fields = list(cls.__schema__.values())
     fields.insert(0, (self.completion_prompt_field, pg.typing.Str()))
-    pg.symbolic.update_schema(cls, fields, extend=False)
+    cls.update_schema(fields, extend=False)
 
   def _maybe_adjust_examples_for_completion(
       self,

langfun/core/llms/google_genai.py

@@ -27,18 +27,18 @@ try:
   import google.generativeai as genai   # pylint: disable=g-import-not-at-top
   BlobDict = genai.types.BlobDict
   GenerativeModel = genai.GenerativeModel
-  Completion = genai.types.Completion
+  Completion = getattr(genai.types, 'Completion', Any)
+  ChatResponse = getattr(genai.types, 'ChatResponse', Any)
+  GenerateContentResponse = getattr(genai.types, 'GenerateContentResponse', Any)
   GenerationConfig = genai.GenerationConfig
-  GenerateContentResponse = genai.types.GenerateContentResponse
-  ChatResponse = genai.types.ChatResponse
 except ImportError:
   genai = None
   BlobDict = Any
   GenerativeModel = Any
   Completion = Any
+  ChatResponse = Any
   GenerationConfig = Any
   GenerateContentResponse = Any
-  ChatResponse = Any
 
 
 @lf.use_init_args(['model'])

langfun/core/llms/google_genai_test.py

@@ -192,39 +192,41 @@ class GenAITest(unittest.TestCase):
   def test_call_with_legacy_completion_model(self):
     orig_get_model = genai.get_model
     genai.get_model = mock_get_model
-    orig_generate_text = genai.generate_text
-    genai.generate_text = mock_generate_text
+    orig_generate_text = getattr(genai, 'generate_text', None)
+    if orig_generate_text is not None:
+      genai.generate_text = mock_generate_text
 
-    lm = google_genai.Palm2(api_key='test_key')
-    self.maxDiff = None
-    self.assertEqual(
-        lm('hello', temperature=2.0, top_k=20).text,
-        (
-            "hello to models/text-bison-001 with {'temperature': 2.0, "
-            "'top_k': 20, 'top_p': None, 'candidate_count': 1, "
-            "'max_output_tokens': None, 'stop_sequences': None}"
-        ),
-    )
+      lm = google_genai.Palm2(api_key='test_key')
+      self.maxDiff = None
+      self.assertEqual(
+          lm('hello', temperature=2.0, top_k=20).text,
+          (
+              "hello to models/text-bison-001 with {'temperature': 2.0, "
+              "'top_k': 20, 'top_p': None, 'candidate_count': 1, "
+              "'max_output_tokens': None, 'stop_sequences': None}"
+          ),
+      )
+      genai.generate_text = orig_generate_text
     genai.get_model = orig_get_model
-    genai.generate_text = orig_generate_text
 
   def test_call_with_legacy_chat_model(self):
     orig_get_model = genai.get_model
     genai.get_model = mock_get_model
-    orig_chat = genai.chat
-    genai.chat = mock_chat
+    orig_chat = getattr(genai, 'chat', None)
+    if orig_chat is not None:
+      genai.chat = mock_chat
 
-    lm = google_genai.Palm2_IT(api_key='test_key')
-    self.maxDiff = None
-    self.assertEqual(
-        lm('hello', temperature=2.0, top_k=20).text,
-        (
-            "hello to models/chat-bison-001 with {'temperature': 2.0, "
-            "'top_k': 20, 'top_p': None, 'candidate_count': 1}"
-        ),
-    )
+      lm = google_genai.Palm2_IT(api_key='test_key')
+      self.maxDiff = None
+      self.assertEqual(
+          lm('hello', temperature=2.0, top_k=20).text,
+          (
+              "hello to models/chat-bison-001 with {'temperature': 2.0, "
+              "'top_k': 20, 'top_p': None, 'candidate_count': 1}"
+          ),
+      )
+      genai.chat = orig_chat
     genai.get_model = orig_get_model
-    genai.chat = orig_chat
 
 
 if __name__ == '__main__':

langfun/core/structured/schema.py

@@ -262,7 +262,7 @@ def class_dependencies(
               )
 
         # Add members as dependencies.
-        for field in _pg_schema(vs.cls).values():
+        for field in pg.schema(vs.cls).values():
           _fill_dependencies(field.value, include_subclasses)
       _add_dependency(vs.cls)
 
@@ -390,7 +390,7 @@ def class_definition(
 ) -> str:
   """Returns the Python class definition."""
   out = io.StringIO()
-  schema = _pg_schema(cls)
+  schema = pg.schema(cls)
   eligible_bases = []
   for base_cls in cls.__bases__:
     if base_cls is not object:
@@ -913,13 +913,3 @@ class Unknown(pg.Object, pg.typing.CustomTyping):
 
 
 UNKNOWN = Unknown()
-
-
-def _pg_schema(cls: Type[Any]) -> pg.Schema:
-  """Returns PyGlove schema for the constructor of a class."""
-  schema = getattr(cls, '__schema__', None)
-  if schema is None:
-    schema = pg.symbolic.callable_schema(
-        cls.__init__, auto_typing=True, auto_doc=True, remove_self=True
-    )
-  return schema

{langfun-0.1.2.dev202409110804.dist-info → langfun-0.1.2.dev202409120804.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: langfun
-Version: 0.1.2.dev202409110804
+Version: 0.1.2.dev202409120804
 Summary: Langfun: Language as Functions.
 Home-page: https://github.com/google/langfun
 Author: Langfun Authors
@@ -21,11 +21,11 @@ Classifier: Topic :: Software Development :: Libraries :: Python Modules
 Classifier: Topic :: Software Development :: Libraries
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: pyglove>=0.4.5.dev20240824
+Requires-Dist: pyglove>=0.4.5.dev202409110000
 Requires-Dist: jinja2>=3.1.2
 Requires-Dist: requests>=2.31.0
 Provides-Extra: all
-Requires-Dist: pyglove>=0.4.5.dev20240824; extra == "all"
+Requires-Dist: pyglove>=0.4.5.dev202409110000; extra == "all"
 Requires-Dist: jinja2>=3.1.2; extra == "all"
 Requires-Dist: requests>=2.31.0; extra == "all"
 Requires-Dist: termcolor==1.1.0; extra == "all"
@@ -80,7 +80,7 @@ Requires-Dist: tqdm>=4.64.1; extra == "ui"
 [![codecov](https://codecov.io/gh/google/langfun/branch/main/graph/badge.svg)](https://codecov.io/gh/google/langfun)
 ![pytest](https://github.com/google/langfun/actions/workflows/ci.yaml/badge.svg)
 
-[**Installation**](#install) | [**Getting started**](#hello-langfun) | [**Tutorial**](https://colab.research.google.com/github/google/langfun/blob/main/docs/notebooks/langfun101.ipynb) | [**Discord community**](https://discord.gg/U6wPN9R68k)
+[**Installation**](#install) | [**Getting started**](#hello-langfun) | [**Tutorial**](https://colab.research.google.com/github/google/langfun/blob/main/docs/notebooks/langfun101.ipynb)
 
 ## Introduction
 

{langfun-0.1.2.dev202409110804.dist-info → langfun-0.1.2.dev202409120804.dist-info}/RECORD

@@ -1,6 +1,6 @@
 langfun/__init__.py,sha256=mCES7t3R7Z-ZQYvG38-yrVqZubrXNfGCa8tI5HGB7mE,2274
 langfun/core/__init__.py,sha256=r86kuy-BiJIveqnXx5OklUUXtMG3q79nWRBum6zFOCQ,4835
-langfun/core/component.py,sha256=Icyoj9ICoJoK2r2PHbrFXbxnseOr9QZZOvKWklLWNo8,10276
+langfun/core/component.py,sha256=nxF4UD7NLduPjrf4IAtysMAIg3IChfoQHjY77vC8f_E,10263
 langfun/core/component_test.py,sha256=q15Xn51cVTu2RKxZ9U5VQgT3bm6RQ4638bKhWBtvW5o,8220
 langfun/core/concurrent.py,sha256=qZteOkA7jzLt7a5AVmNqDc5ZEvj_hwiLECqGMVYdzSU,27756
 langfun/core/concurrent_test.py,sha256=ULVrE6JGzsClRBLHAlqLF1A2mfxMO2X0245qYTYQ76o,16943
@@ -44,7 +44,7 @@ langfun/core/coding/python/parsing_test.py,sha256=9vAWF484kWIm6JZq8NFiMgKUDhXV-d
 langfun/core/coding/python/permissions.py,sha256=1QWGHvzL8MM0Ok_auQ9tURqZHtdOfJaDpBzZ29GUE-c,2544
 langfun/core/coding/python/permissions_test.py,sha256=w5EDb8QxpxgJyZkojyzVWQvDfg366zn99-g__6TbPQ0,2699
 langfun/core/eval/__init__.py,sha256=Ogdr9OtTywhhLPHi3AZzOD2mXX2oyaHWflrSTMm96uA,1899
-langfun/core/eval/base.py,sha256=YU_R9pKITKWyWa5-dSY8Q5O9pK8xioWX1ZdqYVOZcK8,74751
+langfun/core/eval/base.py,sha256=xDZQ3lu5oJaPDZCE5-QbBEajq--HRU64GVKb3xB64aI,74738
 langfun/core/eval/base_test.py,sha256=VEraWaRybSxOCOcZrZouNkiroDEPR6uyFBJoAz-1pQg,26930
 langfun/core/eval/matching.py,sha256=9GX8HfO9jKxgNLAivgy5K88Xhoh6Z7Pptq65pe7vht8,9762
 langfun/core/eval/matching_test.py,sha256=f7iVyXH5KGJBWt4Wp14Bt9J3X59A6Ayfog9MbuFvPew,5532
@@ -57,8 +57,8 @@ langfun/core/llms/anthropic.py,sha256=Gon3fOi31RhZFgNd0ijyTnKnUdp9hrWrCoSXyO4UaL
 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=sIl_Mg7nFVjaN7AJhYCpA_qzDJpSnJzkazepGXpfQQg,7338
-langfun/core/llms/google_genai.py,sha256=OYrlKIEY57CFWYwndvEdhXLwffNvDwKXyy9ULZTNeYI,10885
-langfun/core/llms/google_genai_test.py,sha256=iTISk3tJ4-3gjWmzcKQhEbH3ke4AkEiCu8rAGtB7SvU,7535
+langfun/core/llms/google_genai.py,sha256=btUIfWteBoj8Jl0j8d3e8hyI6p3Biq4rldlQYctVQfg,10936
+langfun/core/llms/google_genai_test.py,sha256=zw14sgWmk0P_irHyb7vpPy1WAuLEE0PmyfiFElu03sA,7686
 langfun/core/llms/groq.py,sha256=pqtyOZ_1_OJMOg8xATWT_B_SVbuT9nMRf4VkH9GzW8g,6308
 langfun/core/llms/groq_test.py,sha256=GYF_Qtq5S1H1TrKH38t6_lkdroqT7v-joYLDKnmS9e0,5274
 langfun/core/llms/llama_cpp.py,sha256=9tXQntSCDtjTF3bnyJrAPCr4N6wycy5nXYvp9uduygE,2843
@@ -102,7 +102,7 @@ langfun/core/structured/parsing.py,sha256=keoVqEfzAbdULh6GawWFsTQzU91MzJXYFZjXGX
 langfun/core/structured/parsing_test.py,sha256=34wDrXaQ-EYhJLfDL8mX9K53oQMSzh5pVYdKjnESmK8,20895
 langfun/core/structured/prompting.py,sha256=_U6Z65AwXvVvfaQFCY9GawB_QV9S3u7P7BOU2URABmw,8873
 langfun/core/structured/prompting_test.py,sha256=SyyBMmw-gwnrnr1MrwkjZiQaMq85kc9MHoYwzCITa10,23266
-langfun/core/structured/schema.py,sha256=oiT4P4Q9pG-QOnFzxETN2EQZqNln8nG4zAJHxcmeX9U,27729
+langfun/core/structured/schema.py,sha256=zpK3UqHPgxaHWptMr4I4zd_f22Yn4IFxF655d4O_jmQ,27416
 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=RjYhwTgktQgyqAjzLvo967nTiIK9KWgP-aNGg4e7ihE,25258
@@ -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=rBW2Qr8yi-aWYwoTwRR-n1peKyMX9QXPZXURjLgoiRs,2264
-langfun-0.1.2.dev202409110804.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-langfun-0.1.2.dev202409110804.dist-info/METADATA,sha256=Ck7nQ7Aa3d5f-4mnluvEQIIHoiD3p5YxEZCe6lgLjsU,8882
-langfun-0.1.2.dev202409110804.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
-langfun-0.1.2.dev202409110804.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
-langfun-0.1.2.dev202409110804.dist-info/RECORD,,
+langfun-0.1.2.dev202409120804.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+langfun-0.1.2.dev202409120804.dist-info/METADATA,sha256=4K_LYV0fVAK6UYIXSgrP56BJ1IyoSOSVTMqEFNHkFyU,8833
+langfun-0.1.2.dev202409120804.dist-info/WHEEL,sha256=cVxcB9AmuTcXqmwrtPhNK88dr7IR_b6qagTj0UvIEbY,91
+langfun-0.1.2.dev202409120804.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
+langfun-0.1.2.dev202409120804.dist-info/RECORD,,