langfun 0.1.2.dev202505160805__py3-none-any.whl → 0.1.2.dev202505180804__py3-none-any.whl

langfun/core/agentic/action.py

@@ -225,7 +225,7 @@ class Action(pg.Object):
         result = self.call(session=session, **kwargs)
         self._invocation.end(result)
       except BaseException as e:
-        error = pg.utils.ErrorInfo.from_exception(e)
+        error = pg.ErrorInfo.from_exception(e)
         self._invocation.end(result=None, error=error)
         if self._session is not None:
           self._session.end(result=None, error=error)
@@ -819,7 +819,7 @@ class ActionInvocation(pg.Object, pg.views.html.HtmlTreeView.Extension):
   ] = {}
 
   error: Annotated[
-      pg.utils.ErrorInfo | None,
+      pg.ErrorInfo | None,
       'Error from the action if failed.'
   ] = None
 
@@ -910,7 +910,7 @@ class ActionInvocation(pg.Object, pg.views.html.HtmlTreeView.Extension):
   def end(
       self,
       result: Any,
-      error: pg.utils.ErrorInfo | None = None,
+      error: pg.ErrorInfo | None = None,
       metadata: dict[str, Any] | None = None,
   ) -> None:
     """Ends the execution of the action with result and metadata."""
@@ -1138,7 +1138,7 @@ class Session(pg.Object, pg.views.html.HtmlTreeView.Extension):
     return self.root.result
 
   @property
-  def final_error(self) -> pg.utils.ErrorInfo | None:
+  def final_error(self) -> pg.ErrorInfo | None:
     """Returns the error of the session."""
     return self.root.error
 
@@ -1186,7 +1186,7 @@ class Session(pg.Object, pg.views.html.HtmlTreeView.Extension):
   def end(
       self,
       result: Any,
-      error: pg.utils.ErrorInfo | None = None,
+      error: pg.ErrorInfo | None = None,
       metadata: dict[str, Any] | None = None,
   ) -> None:
     """Ends the session."""
@@ -1220,7 +1220,7 @@ class Session(pg.Object, pg.views.html.HtmlTreeView.Extension):
 
     if exc_val is not None:
       result, metadata = None, None
-      error = pg.utils.ErrorInfo.from_exception(exc_val)
+      error = pg.ErrorInfo.from_exception(exc_val)
     else:
       actions = self.root.actions
       if actions:

langfun/core/agentic/action_test.py

@@ -308,7 +308,7 @@ class SessionTest(unittest.TestCase):
     self.assertTrue(session.has_started)
     self.assertTrue(session.has_stopped)
     self.assertTrue(session.has_error)
-    self.assertIsInstance(session.final_error, pg.utils.ErrorInfo)
+    self.assertIsInstance(session.final_error, pg.ErrorInfo)
     self.assertIn('Bar error', str(session.root.error))
 
   def test_succeeded_with_explicit_session(self):
@@ -375,7 +375,7 @@ class SessionTest(unittest.TestCase):
     self.assertTrue(session.has_stopped)
     self.assertTrue(session.has_error)
     self.assertIsNone(session.final_result)
-    self.assertIsInstance(session.root.error, pg.utils.ErrorInfo)
+    self.assertIsInstance(session.root.error, pg.ErrorInfo)
     self.assertIn('Bar error', str(session.root.error))
 
   def test_failed_with_explicit_session_without_start(self):
@@ -412,7 +412,7 @@ class SessionTest(unittest.TestCase):
     self.assertTrue(session.has_started)
     self.assertTrue(session.has_stopped)
     self.assertTrue(session.has_error)
-    self.assertIsInstance(session.root.error, pg.utils.ErrorInfo)
+    self.assertIsInstance(session.root.error, pg.ErrorInfo)
     self.assertEqual(len(session.root.execution), 3)
     self.assertEqual(len(session.root.actions), 2)
     self.assertEqual(len(session.root.logs), 1)

langfun/core/data/conversion/gemini.py

@@ -31,10 +31,12 @@ class GeminiMessageConverter(lf.MessageConverter):
           'Chunk preprocessor for Langfun chunk to Gemini chunk conversion. '
           'It will be applied before each Langfun chunk is converted. '
           'If returns None, the chunk will be skipped.'
-      )
+      ),
   ] = None
 
-  def to_value(self, message: lf.Message) -> dict[str, Any]:
+  def to_value(
+      self, message: lf.Message, always_send_content: bool = True
+  ) -> dict[str, Any]:
     """Converts a Langfun message to Gemini API."""
     parts = []
     for chunk in message.chunk():
@@ -44,7 +46,7 @@ class GeminiMessageConverter(lf.MessageConverter):
           continue
 
       if isinstance(chunk, str):
-        parts.append(self._convert_chunk(chunk))
+        parts.append(self._convert_chunk(chunk, always_send_content))
       else:
         if isinstance(chunk, lf_modalities.Mime):
           modalities = [chunk]
@@ -54,10 +56,14 @@ class GeminiMessageConverter(lf.MessageConverter):
           modalities = chunk
         else:
           raise ValueError(f'Unsupported content type: {chunk!r}.')
-        parts.extend(self._convert_chunk(c) for c in modalities)
+        parts.extend(
+            self._convert_chunk(c, always_send_content) for c in modalities
+        )
     return dict(role=self.get_role(message), parts=parts)
 
-  def _convert_chunk(self, chunk: str | lf.Modality) -> Any:
+  def _convert_chunk(
+      self, chunk: str | lf.Modality, always_send_content: bool = True
+  ) -> Any:
     """Converts a Langfun chunk to Gemini chunk."""
     if isinstance(chunk, str):
       return {'text': chunk}
@@ -73,8 +79,10 @@ class GeminiMessageConverter(lf.MessageConverter):
       }
     if chunk.is_text:
       return {'text': chunk.to_text()}
-    if chunk.uri and chunk.uri.lower().startswith(
-        ('http:', 'https:', 'ftp:')
+    if (
+        not always_send_content
+        and chunk.uri
+        and chunk.uri.lower().startswith(('http:', 'https:', 'ftp:'))
     ):
       return {
           'fileData': {

langfun/core/data/conversion/gemini_test.py

@@ -58,11 +58,8 @@ class GeminiConversionTest(unittest.TestCase):
   def test_as_format_with_image(self):
     self.assertEqual(
         lf.Template(
-            'What are the common words from {{image}}, {{pdf}} and {{video}}?',
+            'What are the common words from {{image}} and {{video}}?',
             image=lf_modalities.Image.from_bytes(image_content),
-            pdf=lf_modalities.Custom.from_uri(
-                'https://my.pdf', mime='application/pdf'
-            ),
             video=lf_modalities.Custom.from_uri(
                 'https://www.youtube.com/watch?v=abcd', mime='text/html'
             ),
@@ -79,15 +76,6 @@ class GeminiConversionTest(unittest.TestCase):
                         'mimeType': 'image/png',
                     }
                 },
-                {
-                    'text': ','
-                },
-                {
-                    'fileData': {
-                        'fileUri': 'https://my.pdf',
-                        'mimeType': 'application/pdf',
-                    }
-                },
                 {
                     'text': 'and'
                 },

langfun/core/eval/v2/evaluation.py

@@ -255,7 +255,7 @@ class Evaluation(experiment_lib.Experiment):
       except BaseException as e:  # pylint: disable=broad-except
         if raise_if_has_error:
           raise
-        example.error = pg.object_utils.ErrorInfo.from_exception(e)
+        example.error = pg.ErrorInfo.from_exception(e)
 
   #
   # Handling evaluation scheduling.

langfun/core/eval/v2/example.py

@@ -39,7 +39,7 @@ class Example(pg.JSONConvertible, pg.views.HtmlTreeView.Extension):
   id: int
   input: Any = pg.MISSING_VALUE
   output: Any = pg.MISSING_VALUE
-  error: pg.object_utils.ErrorInfo | None = None
+  error: pg.ErrorInfo | None = None
   metadata: dict[str, Any] = dataclasses.field(default_factory=dict)
   metric_metadata: dict[str, Any] | None = None
   # Execution information.
@@ -47,12 +47,13 @@ class Example(pg.JSONConvertible, pg.views.HtmlTreeView.Extension):
   start_time: float | None = None
   end_time: float | None = None
   usage_summary: lf.UsageSummary | None = None
-  execution_status: dict[str, pg.object_utils.TimeIt.Status] | None = None
+  execution_status: dict[str, pg.utils.TimeIt.Status] | None = None
 
   def __post_init__(self):
     if self.execution_status is not None:
       for status in self.execution_status.values():
         if status.has_error:
+          assert isinstance(status.error, pg.ErrorInfo)
           self.error = status.error
           break
 
@@ -188,7 +189,7 @@ class Example(pg.JSONConvertible, pg.views.HtmlTreeView.Extension):
         text = f'{key}:{value}'
       return pg.views.html.controls.Badge(
           text,
-          css_classes=[pg.object_utils.camel_to_snake(key, '-')],
+          css_classes=[pg.utils.camel_to_snake(key, '-')],
       )
 
     def _render_header():

langfun/core/eval/v2/example_test.py

@@ -22,13 +22,13 @@ Example = example_lib.Example
 class ExampleTest(unittest.TestCase):
 
   def test_basic(self):
-    error = pg.object_utils.ErrorInfo(
+    error = pg.ErrorInfo(
         tag='ValueError',
         description='Bad input',
         stacktrace='...',
     )
     ex = Example(id=1, execution_status={
-        'evaluate': pg.object_utils.TimeIt.Status(
+        'evaluate': pg.utils.TimeIt.Status(
             name='evaluation', elapse=1.0, error=error
         )
     })

langfun/core/structured/querying.py

@@ -649,7 +649,7 @@ def query(
       _mark_query_completed(output_message, None, usage_summary)
     except mapping.MappingError as e:
       _mark_query_completed(
-          e.lm_response, pg.utils.ErrorInfo.from_exception(e), usage_summary
+          e.lm_response, pg.ErrorInfo.from_exception(e), usage_summary
       )
       if lf.RAISE_IF_HAS_ERROR == default:
         raise e
@@ -657,7 +657,7 @@ def query(
       output_message.result = default
     except BaseException as e:
       _mark_query_completed(
-          None, pg.utils.ErrorInfo.from_exception(e), usage_summary
+          None, pg.ErrorInfo.from_exception(e), usage_summary
       )
       raise e
 
@@ -867,7 +867,7 @@ class QueryInvocation(pg.Object, pg.views.HtmlTreeView.Extension):
   ] = None
 
   error: Annotated[
-      pg.utils.ErrorInfo | None,
+      pg.ErrorInfo | None,
       'Error info if the query failed.'
   ] = None
 
@@ -946,7 +946,7 @@ class QueryInvocation(pg.Object, pg.views.HtmlTreeView.Extension):
   def mark_completed(
       self,
       lm_response: lf.Message | None,
-      error: pg.utils.ErrorInfo | None = None,
+      error: pg.ErrorInfo | None = None,
       usage_summary: lf.UsageSummary | None = None) -> None:
     """Marks the query as completed."""
     assert self.end_time is None, 'Query is already completed.'
@@ -965,7 +965,7 @@ class QueryInvocation(pg.Object, pg.views.HtmlTreeView.Extension):
           )
         except mapping.MappingError as e:
           output = None
-          error = pg.utils.ErrorInfo.from_exception(e)
+          error = pg.ErrorInfo.from_exception(e)
         self._output = output
       else:
         assert lm_response is not None

langfun/core/structured/querying_test.py

@@ -1333,7 +1333,7 @@ class QueryInvocationTest(unittest.TestCase):
 
     self.assertEqual(queries[0].id, '123')
     self.assertTrue(queries[0].has_error)
-    self.assertIsInstance(queries[0].error, pg.utils.ErrorInfo)
+    self.assertIsInstance(queries[0].error, pg.ErrorInfo)
     self.assertIn('MappingError', queries[0].error.tag)
     self.assertIsNone(queries[0].output)
 

{langfun-0.1.2.dev202505160805.dist-info → langfun-0.1.2.dev202505180804.dist-info}/METADATA

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

{langfun-0.1.2.dev202505160805.dist-info → langfun-0.1.2.dev202505180804.dist-info}/RECORD

@@ -26,10 +26,10 @@ langfun/core/subscription_test.py,sha256=Y4ZdbZEwm83YNZBxHff0QR4QUa4rdaNXA3_jfIc
 langfun/core/template.py,sha256=jNhYSrbLIn9kZOa03w5QZbyjgfnzJzE_ZrrMvvWY4t4,24929
 langfun/core/template_test.py,sha256=AQv_m9qE93WxhEhSlm1xaBgB4hu0UVtA53dljngkUW0,17090
 langfun/core/agentic/__init__.py,sha256=qR3jlfUO4rhIoYdRDLz-d22YZf3FvU4FW88vsjiGDQQ,1224
-langfun/core/agentic/action.py,sha256=WEKCaqtGVYKHARvY0Nqichc_hMKkJUYarrUky-DsfHk,50709
+langfun/core/agentic/action.py,sha256=ngBN__OUjMrw4eg8ljHKQ7VY-EABW8T7gF1nw_ZkQmM,50673
 langfun/core/agentic/action_eval.py,sha256=YTilyUEkJl_8FVMgdfO17PurWWaEJ6oA15CuefJJRLk,4887
 langfun/core/agentic/action_eval_test.py,sha256=7AkOwNbUX-ZgR1R0a7bvUZ5abNTUV7blf_8Mnrwb-II,2811
-langfun/core/agentic/action_test.py,sha256=FO42Ab_riHHJxD6iJensskDCMx1-j7blzPr3fFaIfwc,15885
+langfun/core/agentic/action_test.py,sha256=46piw5J7vGwmJGjmVG13HQRBmp5TLgkV_ymJ2EQVEIc,15867
 langfun/core/coding/__init__.py,sha256=5utju_fwEsImaiftx4oXKl9FAM8p281k8-Esdh_-m1w,835
 langfun/core/coding/python/__init__.py,sha256=4ByknuoNU-mOIHwHKnTtmo6oD64oMFtlqPlYWmA5Wic,1736
 langfun/core/coding/python/correction.py,sha256=4PD76Xfv36Xrm8Ji3-GgGDNImtcDqWfMw3z6ircJMlM,7285
@@ -46,8 +46,8 @@ langfun/core/data/__init__.py,sha256=qllw9ST1vveZv-1E0VM5hezn1YH-OcqGI-yFqQYnWgI
 langfun/core/data/conversion/__init__.py,sha256=ZcGntBruvvZSfESO-Tha1nzHfgWEK7I1u78Jw8gsoVU,883
 langfun/core/data/conversion/anthropic.py,sha256=0xf1sWt6WhmG8EsaeLY4Ee7S3FcDWKPOtn6caCBhtrQ,4431
 langfun/core/data/conversion/anthropic_test.py,sha256=R43PyveNUCHNCvfu6RFsTk0EIKK8M1Gzng0Kay8TlE8,8534
-langfun/core/data/conversion/gemini.py,sha256=k-BJFQ_xuYRTNH_k0cJlZlhN1VrQHiFjckSxRCyUGNY,5523
-langfun/core/data/conversion/gemini_test.py,sha256=KIaWdY8CIn0YMaSomxTizvwCrljvt7lbDi3WSEbb1FE,7637
+langfun/core/data/conversion/gemini.py,sha256=fQ5yjwmQLTb-YJN1p6n3cxM9TQoniOkaLvT-p-jMoP8,5722
+langfun/core/data/conversion/gemini_test.py,sha256=G-av2BUngBkxOkJz94CMpZRGq6DGDBvgLltoezuohm0,7239
 langfun/core/data/conversion/openai.py,sha256=sSpkDSxMJWJ3I1dNICBCzvLsJv4iiLg8FPYLtubBJUM,4181
 langfun/core/data/conversion/openai_test.py,sha256=38WV_3ofFZiUF10bTKnZp4VyuDP5-81aR3h3Q0HlBm0,5283
 langfun/core/eval/__init__.py,sha256=OEXr1ZRuvLuhJJfuQ1ZWQ-SvYzjyrtiAAEogYaB7E6o,1933
@@ -63,10 +63,10 @@ langfun/core/eval/v2/__init__.py,sha256=9lNKJwbvl0lcFblAXYT_OHI8fOubJsTOdSkxEqsP
 langfun/core/eval/v2/checkpointing.py,sha256=t47rBfzGZYgIqWW1N1Ak9yQnNtHd-IRbEO0cZjG2VRo,11755
 langfun/core/eval/v2/checkpointing_test.py,sha256=NggOSJ_6XSa4cNP6nGIu9wLsK59dUwe8SPWDiXtGGDE,9197
 langfun/core/eval/v2/eval_test_helper.py,sha256=sKFi_wPYCNmr96WyTduuXY0KnxjFxcJyEhXey-_nGX8,3962
-langfun/core/eval/v2/evaluation.py,sha256=BijbrYufnlRZLryxezDU32gHjFCCZvLAZMLF6kQ90eA,27050
+langfun/core/eval/v2/evaluation.py,sha256=ihT5dljnUkHM97XS9OwE2wOnYC-oYnHYgG5KN1hmiaU,27037
 langfun/core/eval/v2/evaluation_test.py,sha256=QNp_HEvRTupvNuLEeYTvylykh1Ut2jpMqHQ-gCUZQ10,6919
-langfun/core/eval/v2/example.py,sha256=Jegt-viQSNYzPVkOZE_M19GON2TYGTct4Cp9HnJ7DGo,10861
-langfun/core/eval/v2/example_test.py,sha256=1DNm6EuyZOq827DKvf3oTRVFkMNM_qTnLUpvOjpgz5I,3419
+langfun/core/eval/v2/example.py,sha256=v1dIz89pccIqujt7utrk0EbqMWM9kBn-2fYGRTKe358,10890
+langfun/core/eval/v2/example_test.py,sha256=wsHQD6te7ghROmxe3Xg_NK4TU0xS2MkNfnpo-H0H8xM,3399
 langfun/core/eval/v2/experiment.py,sha256=fb3RHNOSRftV7ZTBfYVV50iEevqdPwRHCt3mgtLzuFw,33408
 langfun/core/eval/v2/experiment_test.py,sha256=UmCobeS6ifPcaGkTJp0WPISolXrVFbeFCBiyJeA0Lt4,13666
 langfun/core/eval/v2/metric_values.py,sha256=_B905bC-jxrYPLSEcP2M8MaHZOVMz_bVrUw8YC4arCE,4660
@@ -137,8 +137,8 @@ langfun/core/structured/mapping.py,sha256=iraHpcEeF_iuEX2eoTsLGwTHHvxqp2gNDjoMf9
 langfun/core/structured/mapping_test.py,sha256=OntYvfDitAf0tAnzQty3YS90vyEn6FY1Mi93r_ViEk8,9594
 langfun/core/structured/parsing.py,sha256=MGvI7ypXlwfzr5XB8_TFU9Ei0_5reYqkWkv64eAy0EA,12015
 langfun/core/structured/parsing_test.py,sha256=V8Cj1tJK4Lxv_b0YQj6-2hzXZgnYNBa2JR7rOLRBKoQ,22346
-langfun/core/structured/querying.py,sha256=7QvM4TS57O5kDCty6H8leWXfZxcN5ugWV-4bmdDABC0,38006
-langfun/core/structured/querying_test.py,sha256=AXIVamBeKvby10zogjZl_wqtBopbpud-NNEZlqfLyqY,49766
+langfun/core/structured/querying.py,sha256=vE_NOLNlIe4A0DueQfyiBEUh3AsSD8Hhx2dSDHNYpYk,37976
+langfun/core/structured/querying_test.py,sha256=pYWXqAnzp5eOCjU4yEPtE73iLNqxHISb3y3FaSbI7vs,49760
 langfun/core/structured/schema.py,sha256=r_ewdRMsALVOdnvGSeYBcz2-VJ_3_nMxY4GtzUHCYUU,29111
 langfun/core/structured/schema_generation.py,sha256=pEWeTd8tQWYnEHukas6GVl4uGerLsQ2aNybtnm4Qgxc,5352
 langfun/core/structured/schema_generation_test.py,sha256=RM9s71kMNg2jTePwInkiW9fK1ACN37eyPeF8OII-0zw,2950
@@ -156,8 +156,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.dev202505160805.dist-info/licenses/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-langfun-0.1.2.dev202505160805.dist-info/METADATA,sha256=BClYluq7hbXEWsTxg73Tu4fYJ-PF4lUWBRtEM16UQwc,8178
-langfun-0.1.2.dev202505160805.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
-langfun-0.1.2.dev202505160805.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
-langfun-0.1.2.dev202505160805.dist-info/RECORD,,
+langfun-0.1.2.dev202505180804.dist-info/licenses/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+langfun-0.1.2.dev202505180804.dist-info/METADATA,sha256=DI4w_LawSCzpgClMnLKFSx8lKZrs98KY1EPtsjb0Ooo,8178
+langfun-0.1.2.dev202505180804.dist-info/WHEEL,sha256=Nw36Djuh_5VDukK0H78QzOX-_FQEo6V37m3nkm96gtU,91
+langfun-0.1.2.dev202505180804.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
+langfun-0.1.2.dev202505180804.dist-info/RECORD,,