langfun 0.1.2.dev202501060804__py3-none-any.whl → 0.1.2.dev202501080804__py3-none-any.whl

langfun/core/coding/python/correction.py

@@ -40,6 +40,7 @@ def run_with_correction(
     sandbox: bool | None = None,
     timeout: int | None = 5,
     returns_code: bool = False,
+    returns_stdout: bool = False,
     outputs_intermediate: bool = False,
 ) -> Any | tuple[Any, str]:
   """Correct code with a language model via self-play.
@@ -62,6 +63,7 @@ def run_with_correction(
       timeout. Applicable only when sandbox is set to True.
     returns_code: If True, the return value is a tuple of (result, final code).
       Otherwise the return value is the result only.
+    returns_stdout: If True, the stdout (a str) will be returned.
     outputs_intermediate: If True, intermediate output will be outputted as a
       dict, with the last line's value accessible by key '__result__'. Otherwise
       the value of the last line will be returned.
@@ -87,6 +89,7 @@ def run_with_correction(
             global_vars=global_vars,
             sandbox=sandbox,
             timeout=timeout,
+            returns_stdout=returns_stdout,
             outputs_intermediate=outputs_intermediate,
         )
     )

langfun/core/coding/python/execution.py

@@ -57,6 +57,7 @@ def evaluate(
     *,
     global_vars: dict[str, Any] | None = None,
     permission: permissions.CodePermission | None = None,
+    returns_stdout: bool = False,
     outputs_intermediate: bool = False,
 ) -> Any | dict[str, Any]:
   """Executes Python code.
@@ -71,14 +72,17 @@ def evaluate(
     global_vars: An optional dict as the globals that could be referenced by the
       code.
     permission: Permission for the Python code to run.
-    outputs_intermediate: If True, intermediate output will be outputted as a
-      dict, with the last line's value accessible by key '__result__'. Otherwise
-      the value of the last line will be returned.
+    returns_stdout: If True, the stdout (a str) will be returned.
+    outputs_intermediate: Applicable when returns_stdout is False. If True,
+      intermediate output will be outputted as a dict, with the last line's
+      value accessible by key '__result__' and the std output accessible by
+      key '__stdout__'. Otherwise the value of the last line will be returned.
 
   Returns:
-    The value of the last line of the code. Or a dict of variable name to
-    their values if `outputs_intermediate` is set to True, with the final result
-    accessible by key '__result__'.
+    The value of the last line of the code block. Or a dict of variable
+    names of all locals to their evaluated values as the output of the code to
+    run. The value for the last line can be accessed by key '__result__'. Or the
+    stdout as a str.
   """
   # Set up the permission and context.
   permission = permission or permissions.get_permission()
@@ -136,6 +140,8 @@ def evaluate(
         raise errors.CodeError(code, e) from e
       global_vars[RESULT_KEY] = list(global_vars.values())[-1]
 
+  if returns_stdout:
+    return stdout.getvalue()
   if outputs_intermediate:
     outputs = {}
     for k, v in global_vars.items():
@@ -258,6 +264,7 @@ def run(
     *,
     global_vars: dict[str, Any] | None = None,
     permission: permissions.CodePermission | None = None,
+    returns_stdout: bool = False,
     outputs_intermediate: bool = False,
     sandbox: bool | None = None,
     timeout: float | None = None,
@@ -273,9 +280,11 @@ def run(
     code: Python code to run.
     global_vars: An optional dict of
     permission: Permission for the Python code to run.
-    outputs_intermediate: If True, all variables created as locals will be
-      returned, with the final result accessible by key '__result__'. Otherwise
-      only the final result will be returned.
+    returns_stdout: If True, the stdout (a str) will be returned.
+    outputs_intermediate: Applicable when returns_stdout is False. If True,
+      intermediate output will be outputted as a dict, with the last line's
+      value accessible by key '__result__' and the std output accessible by
+      key '__stdout__'. Otherwise the value of the last line will be returned.
     sandbox: If True, run code in sandbox; If False, run code in current
       process. If None, run in sandbox first, if the output could not be
       serialized and pass to current process, run the code again in current
@@ -285,7 +294,8 @@ def run(
   Returns:
     The value of the last line of the code block. Or a dict of variable
     names of all locals to their evaluated values as the output of the code to
-    run. The value for the last line can be accessed by key '__result__'.
+    run. The value for the last line can be accessed by key '__result__'. Or the
+    stdout as a str.
 
   Raises:
     TimeoutError: If the execution time exceeds the timeout.
@@ -293,5 +303,6 @@ def run(
   """
   return call(
       evaluate, code=code, global_vars=global_vars, permission=permission,
-      outputs_intermediate=outputs_intermediate,
-      sandbox=sandbox, timeout=timeout)
+      returns_stdout=returns_stdout, outputs_intermediate=outputs_intermediate,
+      sandbox=sandbox, timeout=timeout
+  )

langfun/core/coding/python/execution_test.py

@@ -63,6 +63,15 @@ class EvaluateTest(unittest.TestCase):
         ),
         3,
     )
+    with self.assertRaisesRegex(errors.CodeError, 'ValueError'):
+      execution.evaluate(
+          """
+          def foo():
+            raise ValueError("intentional error")
+          foo()
+          """,
+          permission=permissions.CodePermission.ALL
+      )
 
   def test_class_def(self):
     ret = execution.evaluate(
@@ -102,16 +111,20 @@ class EvaluateTest(unittest.TestCase):
     self.assertIs(ret['__result__'], ret['bar'])
 
   def test_function_def_and_call(self):
-    ret = execution.evaluate(
+    code = (
         """
         def foo(x, y):
           return x + y
 
         def bar(z):
+          print(f'z is {z}')
           return z + foo(z, z)
 
         bar(1)
-        """,
+        """
+    )
+    ret = execution.evaluate(
+        code,
         permission=permissions.CodePermission.ALL,
         outputs_intermediate=True,
     )
@@ -119,6 +132,12 @@ class EvaluateTest(unittest.TestCase):
         list(ret.keys()), ['foo', 'bar', '__result__', '__stdout__']
     )
     self.assertEqual(ret['__result__'], 3)
+    ret = execution.evaluate(
+        code,
+        permission=permissions.CodePermission.ALL,
+        returns_stdout=True,
+    )
+    self.assertEqual(ret, 'z is 1\n')
 
   def test_complex(self):
     ret = execution.evaluate(

langfun/core/coding/python/generation.py

@@ -88,6 +88,8 @@ class PythonCode(pg.Object):
       sandbox: bool | None = None,
       timeout: int | None = 5,
       global_vars: dict[str, Any] | None = None,
+      returns_stdout: bool = False,
+      outputs_intermediate: bool = False,
       autofix: int = 3,
       autofix_lm: lf.LanguageModel | None = None,
   ) -> Any:
@@ -101,13 +103,22 @@ class PythonCode(pg.Object):
       timeout: Timeout in seconds. If None, there is no timeout. Applicable when
         sandbox is set to True.
       global_vars: Global variables that could be accessed from the source code.
+      returns_stdout: If True, the stdout (a str) will be returned.
+      outputs_intermediate: Applicable when returns_stdout is False. If True,
+        intermediate output will be outputted as a dict, with the last line's
+        value accessible by key '__result__' and the std output accessible by 
+        key '__stdout__'. Otherwise the value of the last line will be returned.
       autofix: Number of attempts to auto fix the generated code. If 0, autofix
         is disabled.
       autofix_lm: Language model to be used. If not specified, it will try to
         use the `lm` under `lf.context`.
 
     Returns:
-      The value of the last expression in the source code.
+      The value of the last expression in the source code. Or a dict of local
+      variable names defined in the source code to their values if
+      `outputs_intermediate` is set to True. The value for the last line can be
+      accessed by key '__result__'. Or the stdout as a str if `returns_stdout`
+      is set to True.
 
     Raises:
       TimeoutError: If `sandbox` is True and timeout has reached.
@@ -121,6 +132,8 @@ class PythonCode(pg.Object):
         max_attempts=autofix,
         lm=autofix_lm,
         returns_code=True,
+        returns_stdout=returns_stdout,
+        outputs_intermediate=outputs_intermediate,
     )
     self.rebind(source=updated_code)
     return result
@@ -158,18 +171,14 @@ class PythonCode(pg.Object):
       TimeoutError: If `sandbox` is True and timeout has reached.
       Exception: Any errors that the source code has raised.
     """
-    result, updated_code = correction.run_with_correction(
-        self.source,
-        global_vars=global_vars,
+    return self(
         sandbox=sandbox,
         timeout=timeout,
+        global_vars=global_vars,
+        autofix=autofix,
+        autofix_lm=autofix_lm,
         outputs_intermediate=True,
-        max_attempts=autofix,
-        lm=autofix_lm,
-        returns_code=True,
     )
-    self.rebind(source=updated_code)
-    return result
 
 
 class PythonFunction(pg.Object):

langfun/core/language_model.py

@@ -434,7 +434,10 @@ class LanguageModel(component.Component):
   def __init__(self, *args, **kwargs) -> None:
     """Overrides __init__ to pass through **kwargs to sampling options."""
 
-    sampling_options = kwargs.pop('sampling_options', LMSamplingOptions())
+    sampling_options = kwargs.pop(
+        'sampling_options',
+        pg.clone(self.__schema__.fields['sampling_options'].default_value)
+    )
     sampling_options_delta = {}
 
     for k, v in kwargs.items():

langfun/core/language_model_test.py

@@ -117,6 +117,21 @@ class LanguageModelTest(unittest.TestCase):
     self.assertEqual(lm.sampling_options.top_k, 2)
     self.assertEqual(lm.max_attempts, 2)
 
+  def test_subclassing(self):
+
+    class ChildModel(lm_lib.LanguageModel):
+
+      sampling_options = lm_lib.LMSamplingOptions(
+          temperature=0.5, top_k=20
+      )
+
+      def _sample(self, *args, **kwargs):
+        pass
+
+    lm = ChildModel(top_k=10)
+    self.assertEqual(lm.sampling_options.temperature, 0.5)
+    self.assertEqual(lm.sampling_options.top_k, 10)
+
   def test_sample(self):
     lm = MockModel(top_k=1)
     self.assertEqual(

langfun/core/llms/google_genai.py

@@ -68,6 +68,7 @@ class GeminiFlash2_0ThinkingExp_20241219(GenAI):  # pylint: disable=invalid-name
 
   api_version = 'v1alpha'
   model = 'gemini-2.0-flash-thinking-exp-1219'
+  timeout = None
 
 
 class GeminiFlash2_0Exp(GenAI):  # pylint: disable=invalid-name

langfun/core/llms/openai.py

@@ -553,26 +553,31 @@ class GptO1(OpenAI):
 
   model = 'o1'
   multimodal = True
+  timeout = None
 
 
 class GptO1Preview(OpenAI):
   """GPT-O1."""
   model = 'o1-preview'
+  timeout = None
 
 
 class GptO1Preview_20240912(OpenAI):   # pylint: disable=invalid-name
   """GPT O1."""
   model = 'o1-preview-2024-09-12'
+  timeout = None
 
 
 class GptO1Mini(OpenAI):
   """GPT O1-mini."""
   model = 'o1-mini'
+  timeout = None
 
 
 class GptO1Mini_20240912(OpenAI):   # pylint: disable=invalid-name
   """GPT O1-mini."""
   model = 'o1-mini-2024-09-12'
+  timeout = None
 
 
 class Gpt4(OpenAI):

langfun/core/llms/vertexai.py

@@ -90,6 +90,8 @@ class VertexAI(gemini.Gemini):
       )
 
     self._project = project
+    self._location = location
+
     credentials = self.credentials
     if credentials is None:
       # Use default credentials.
@@ -114,9 +116,10 @@ class VertexAI(gemini.Gemini):
 
   @property
   def api_endpoint(self) -> str:
+    assert self._api_initialized
     return (
-        f'https://{self.location}-aiplatform.googleapis.com/v1/projects/'
-        f'{self.project}/locations/{self.location}/publishers/google/'
+        f'https://{self._location}-aiplatform.googleapis.com/v1/projects/'
+        f'{self._project}/locations/{self._location}/publishers/google/'
         f'models/{self.model}:generateContent'
     )
 
@@ -126,6 +129,7 @@ class VertexAIGeminiFlash2_0ThinkingExp_20241219(VertexAI):  # pylint: disable=i
 
   api_version = 'v1alpha'
   model = 'gemini-2.0-flash-thinking-exp-1219'
+  timeout = None
 
 
 class VertexAIGeminiFlash2_0Exp(VertexAI):  # pylint: disable=invalid-name

langfun/core/llms/vertexai_test.py

@@ -41,7 +41,7 @@ class VertexAITest(unittest.TestCase):
     os.environ['VERTEXAI_LOCATION'] = 'us-central1'
     model = vertexai.VertexAIGeminiPro1()
     self.assertTrue(model.model_id.startswith('VertexAI('))
-    self.assertIsNotNone(model.api_endpoint)
+    self.assertIn('us-central1', model.api_endpoint)
     self.assertTrue(model._api_initialized)
     self.assertIsNotNone(model._session)
     del os.environ['VERTEXAI_PROJECT']

{langfun-0.1.2.dev202501060804.dist-info → langfun-0.1.2.dev202501080804.dist-info}/METADATA

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

{langfun-0.1.2.dev202501060804.dist-info → langfun-0.1.2.dev202501080804.dist-info}/RECORD

@@ -8,8 +8,8 @@ langfun/core/console.py,sha256=Fra2_MSWZbFh6rY8HZoYgpGLsrNvhaGuL03znOwQbhM,2529
 langfun/core/console_test.py,sha256=pBOcuNMJdVELywvroptfcRtJMsegMm3wSlHAL2TdxVk,1679
 langfun/core/langfunc.py,sha256=G50YgoVZ0y1GFw2ev41MlOqr6qa8YakbvNC0h_E0PiA,11140
 langfun/core/langfunc_test.py,sha256=fKIAqcSNI_7M6nwoZW77HEam8Oa6vcWhsCNgVJanzb4,8822
-langfun/core/language_model.py,sha256=b15MZ_qbydnz5vQ09t7sf9tc3C7qWvMSxUrGfT0p99I,33827
-langfun/core/language_model_test.py,sha256=hnYhtw7GM_TbhgsJzHNYTaoDewUlPHpOVlI7xEkCFuI,31783
+langfun/core/language_model.py,sha256=gSy_2qDBjGbg349MpISp7u1TQETVeq3wazBXVHbInmM,33896
+langfun/core/language_model_test.py,sha256=lFPXBcxofvvL6u5GEpAAbsPxIDmk0Wy038SQ_mBIOz8,32153
 langfun/core/logging.py,sha256=W3mLEMXdo210Q5OX3a1ZTc4nU-xMy73-IfNKnsA-RFo,8051
 langfun/core/logging_test.py,sha256=N7-YvSXC8zvnr2SNwWHOykn1CFmqvIuTLDgn41Ku9JU,6642
 langfun/core/memory.py,sha256=f-asN1F7Vehgdn_fK84v73GrEUOxRtaW934keutTKjk,2416
@@ -34,13 +34,13 @@ langfun/core/agentic/action_eval_test.py,sha256=tRUkWmOE9p0rpNOq19xAY2oDEnYsEEyk
 langfun/core/agentic/action_test.py,sha256=Gu7P5XQvzqbKawn2jjyTpWaARzzhzO04KkC1TuBnUnw,4612
 langfun/core/coding/__init__.py,sha256=5utju_fwEsImaiftx4oXKl9FAM8p281k8-Esdh_-m1w,835
 langfun/core/coding/python/__init__.py,sha256=MJ-vubliz-ebrZH3OBRKBwMi0S9-FrhGCp8YQLR6_I4,1776
-langfun/core/coding/python/correction.py,sha256=cg5intTKlx7Lr4VGU-qc90_qF2nuat1mpIAcGj-JmNw,7018
+langfun/core/coding/python/correction.py,sha256=xbnHFENQv0ibPzpAW8LFQ3TcbqzD0Y3I6nC1Dy2h_GI,7161
 langfun/core/coding/python/correction_test.py,sha256=qGxXuHaO32onF6cAoTfO1_sH_lM7-3dE9UqaaU8Myxs,4215
 langfun/core/coding/python/errors.py,sha256=fX3Du63uGm25YFXW9D-bV2gntTdTAX3hBFtAnRlmg14,3166
 langfun/core/coding/python/errors_test.py,sha256=_ZbWJCFIb-FkCK7K1zCuH8W3x_NFt-jNe3dfP8yqaD4,2323
-langfun/core/coding/python/execution.py,sha256=raZix62g2fwt6Lgykll2DFzkLlEjVqN9E73q0iaVdak,10185
-langfun/core/coding/python/execution_test.py,sha256=lExY6GMLeuCsCKXgM2KbAPJ6kqSlfHmz3RG0-dqfVcI,7197
-langfun/core/coding/python/generation.py,sha256=xivSeOKGN00HnG1TLuFhPfP-JyRuRrSELxVJW2ngqIQ,7750
+langfun/core/coding/python/execution.py,sha256=vf8AzDcL_9xh-kpTKWywt9gV7Pc8KLghOHj6hrpiqS8,10762
+langfun/core/coding/python/execution_test.py,sha256=xBsk5OZuuEY1_w7dxu25akL-NVHm02xjzyOQ2rPWhgY,7693
+langfun/core/coding/python/generation.py,sha256=MqzoFdB3v7BtrAzqIMMyH8RvqaNJ6TSqZ9Xw-iPmPTI,8427
 langfun/core/coding/python/generation_test.py,sha256=54bgKr1DgzYFLoqR8bTn7Yjol0gPCuR6XvRltR4l6YM,2777
 langfun/core/coding/python/parsing.py,sha256=LMg8REP4VDY0YQjtPAGNAW4rKlMNdSXF8m19wMT9yrY,7128
 langfun/core/coding/python/parsing_test.py,sha256=9vAWF484kWIm6JZq8NFiMgKUDhXV-deRl1QMmNERfAA,7386
@@ -86,18 +86,18 @@ langfun/core/llms/fake.py,sha256=gCHBYBLvBCsC78HI1hpoqXCS-p1FMTgY1P1qh_sGBPk,307
 langfun/core/llms/fake_test.py,sha256=2h13qkwEz_JR0mtUDPxdAhQo7MueXaFSwsD2DIRDW9g,7653
 langfun/core/llms/gemini.py,sha256=tfM4vrt0WnvnrxRhWXZWh7Gp8dYYfMnSbi9uOstkSak,17399
 langfun/core/llms/gemini_test.py,sha256=2ERhYWCJwnfDTQbCaZHFuB1TdWJFrOBS7yyCBInIdQk,6129
-langfun/core/llms/google_genai.py,sha256=p19jTO3D-wNUIxDcLwypgGpTCjvwQxqxCMBoPjtaetM,3645
+langfun/core/llms/google_genai.py,sha256=85Vmx5QmsziON03PRsFQINSu5NF6pAAuFFhUdDteWGc,3662
 langfun/core/llms/google_genai_test.py,sha256=JZf_cbQ4GGGpwiQCLjFJn7V4jxBBqgZhIx91AzbGKVo,1250
 langfun/core/llms/groq.py,sha256=dCnR3eAECEKuKKAAj-PDTs8NRHl6CQPdf57m1f6a79U,10312
 langfun/core/llms/groq_test.py,sha256=GYF_Qtq5S1H1TrKH38t6_lkdroqT7v-joYLDKnmS9e0,5274
 langfun/core/llms/llama_cpp.py,sha256=9tXQntSCDtjTF3bnyJrAPCr4N6wycy5nXYvp9uduygE,2843
 langfun/core/llms/llama_cpp_test.py,sha256=MWO_qaOeKjRniGjcaWPDScd7HPaIJemqUZoslrt4FPs,1806
-langfun/core/llms/openai.py,sha256=dLDVBB47nJ30XCwjJpAZMc55ZlZXB__PcfcICCRNuXQ,20995
+langfun/core/llms/openai.py,sha256=g5X_ySW-b2f0uRE8sb3_W1sAB-pWpKLNNoflBoRBwrc,21080
 langfun/core/llms/openai_test.py,sha256=kOWa1nf-nJvtYY10REUw5wojh3ZgfU8tRaCZ8wUgJbA,16623
 langfun/core/llms/rest.py,sha256=sWbYUV8S3SuOg9giq7xwD-xDRfaF7NP_ig7bI52-Rj4,3442
 langfun/core/llms/rest_test.py,sha256=NZ3Nf0XQVpT9kLP5cBVo_yBHLI7vWTYhWQxYEJVMGs4,3472
-langfun/core/llms/vertexai.py,sha256=D9pC-zNRTZ4LDZeV_tjP_c8y3JaGQxTOXpp8VIthwCI,5420
-langfun/core/llms/vertexai_test.py,sha256=KqQkJpjZvpqp-JmDK2yTYK_XyLIyizzb4EeTHfUV8sk,1779
+langfun/core/llms/vertexai.py,sha256=MuwLPTJ6-9x2uRDCSM1_biPK6M76FFlL1ezf5OmobDA,5504
+langfun/core/llms/vertexai_test.py,sha256=iXjmQs7TNiwcueoaRGpdp4KnASkDJaTP__Z9QroN8zQ,1787
 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=i58oiQL28RDsq37dwqgVpC2mBETJjIEFS20yHiV5MKU,5185
@@ -148,8 +148,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.dev202501060804.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-langfun-0.1.2.dev202501060804.dist-info/METADATA,sha256=3MbJlnp-TmGrXXb9jhRPLd7g86sm9b2zDXLWIWMkkZA,7941
-langfun-0.1.2.dev202501060804.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
-langfun-0.1.2.dev202501060804.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
-langfun-0.1.2.dev202501060804.dist-info/RECORD,,
+langfun-0.1.2.dev202501080804.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+langfun-0.1.2.dev202501080804.dist-info/METADATA,sha256=nLlWl4_b1QuxJGdx2F9WQg7MUkf9t4qsqLxGupPJjqU,7941
+langfun-0.1.2.dev202501080804.dist-info/WHEEL,sha256=A3WOREP4zgxI0fKrHUG8DC8013e3dK3n7a6HDbcEIwE,91
+langfun-0.1.2.dev202501080804.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
+langfun-0.1.2.dev202501080804.dist-info/RECORD,,