langfun 0.1.2.dev202409110804__tar.gz → 0.1.2.dev202409120804__tar.gz

{langfun-0.1.2.dev202409110804 → langfun-0.1.2.dev202409120804}/PKG-INFO

@@ -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: pandas>=2.0.3; extra == "mime-xlsx"
 [![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 → langfun-0.1.2.dev202409120804}/README.md

@@ -8,7 +8,7 @@
 [![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 → langfun-0.1.2.dev202409120804}/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-0.1.2.dev202409110804 → langfun-0.1.2.dev202409120804}/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-0.1.2.dev202409110804 → langfun-0.1.2.dev202409120804}/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-0.1.2.dev202409110804 → langfun-0.1.2.dev202409120804}/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-0.1.2.dev202409110804 → langfun-0.1.2.dev202409120804}/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 → langfun-0.1.2.dev202409120804}/langfun.egg-info/PKG-INFO

@@ -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: pandas>=2.0.3; extra == "mime-xlsx"
 [![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 → langfun-0.1.2.dev202409120804}/langfun.egg-info/requires.txt

@@ -1,9 +1,9 @@
-pyglove>=0.4.5.dev20240824
+pyglove>=0.4.5.dev202409110000
 jinja2>=3.1.2
 requests>=2.31.0
 
 [all]
-pyglove>=0.4.5.dev20240824
+pyglove>=0.4.5.dev202409110000
 jinja2>=3.1.2
 requests>=2.31.0
 termcolor==1.1.0