langfun 0.1.2.dev202412100804__py3-none-any.whl → 0.1.2.dev202412120804__py3-none-any.whl

langfun/core/agentic/action.py

@@ -64,23 +64,16 @@ class Action(pg.Object):
 
     with session.track_action(self):
       result = self.call(session=session, **kwargs)
-      metadata = dict()
-      if (isinstance(result, tuple)
-          and len(result) == 2 and isinstance(result[1], dict)):
-        result, metadata = result
 
       # For the top-level action, we store the session in the metadata.
       if new_session:
         self._session = session
-      self._result, self._result_metadata = result, metadata
+      self._result = result
+      self._result_metadata = session.current_action.result_metadata
       return self._result
 
   @abc.abstractmethod
-  def call(
-      self,
-      session: 'Session',
-      **kwargs
-  ) -> Union[Any, tuple[Any, dict[str, Any]]]:
+  def call(self, session: 'Session', **kwargs) -> Any:
     """Calls the action.
 
     Args:
@@ -88,7 +81,7 @@ class Action(pg.Object):
       **kwargs: Additional keyword arguments to pass to the action.
 
     Returns:
-      The result of the action or a tuple of (result, result_metadata).
+      The result of the action.
     """
 
 
@@ -726,6 +719,11 @@ class Session(pg.Object, pg.views.html.HtmlTreeView.Extension):
     """Returns the current invocation."""
     return self._current_action
 
+  def add_metadata(self, **kwargs: Any) -> None:
+    """Adds metadata to the current invocation."""
+    with pg.notify_on_change(False):
+      self._current_action.result_metadata.update(kwargs)
+
   def phase(self, name: str) -> ContextManager[ExecutionTrace]:
     """Context manager for starting a new execution phase."""
     return self.current_action.phase(name)

langfun/core/agentic/action_test.py

@@ -33,7 +33,8 @@ class SessionTest(unittest.TestCase):
         test.assertIs(session.current_action.action, self)
         session.info('Begin Bar')
         session.query('bar', lm=lm)
-        return 2, dict(note='bar')
+        session.add_metadata(note='bar')
+        return 2
 
     class Foo(action_lib.Action):
       x: int
@@ -45,7 +46,8 @@ class SessionTest(unittest.TestCase):
           session.query('foo', lm=lm)
         with session.track_queries():
           self.make_additional_query(lm)
-        return self.x + Bar()(session, lm=lm), dict(note='foo')
+        session.add_metadata(note='foo')
+        return self.x + Bar()(session, lm=lm)
 
       def make_additional_query(self, lm):
         lf_structured.query('additional query', lm=lm)

langfun/core/eval/v2/evaluation.py

@@ -556,6 +556,9 @@ class Evaluation(experiment_lib.Experiment):
           border: 0px;
           margin: 0px;
         }
+        .eval-details .tab-control {
+          width: 100%;
+        }
         .eval-details .tab-button {
           font-size: large;
         }

langfun/core/llms/vertexai.py

@@ -40,7 +40,7 @@ except ImportError:
 
 # https://cloud.google.com/vertex-ai/generative-ai/pricing
 # describes that the average number of characters per token is about 4.
-AVGERAGE_CHARS_PER_TOEKN = 4
+AVGERAGE_CHARS_PER_TOKEN = 4
 
 
 # Price in US dollars,
@@ -102,6 +102,18 @@ SUPPORTED_MODELS_AND_SETTINGS = {
         cost_per_1k_input_chars=0.000125,
         cost_per_1k_output_chars=0.000375,
     ),
+    # TODO(sharatsharat): Update costs when published
+    'gemini-exp-1206': pg.Dict(
+        rpm=20,
+        cost_per_1k_input_chars=0.000,
+        cost_per_1k_output_chars=0.000,
+    ),
+    # TODO(sharatsharat): Update costs when published
+    'gemini-2.0-flash-exp': pg.Dict(
+        rpm=20,
+        cost_per_1k_input_chars=0.000,
+        cost_per_1k_output_chars=0.000,
+    ),
     # TODO(chengrun): Set a more appropriate rpm for endpoint.
     'vertexai-endpoint': pg.Dict(
         rpm=20,
@@ -215,7 +227,7 @@ class VertexAI(rest.REST):
     return (
         cost_per_1k_input_chars * num_input_tokens
         + cost_per_1k_output_chars * num_output_tokens
-    ) * AVGERAGE_CHARS_PER_TOEKN / 1000
+    ) * AVGERAGE_CHARS_PER_TOKEN / 1000
 
   @functools.cached_property
   def _session(self):

langfun/core/message.py

@@ -769,7 +769,6 @@ class Message(
             padding: 20px;
             margin: 10px 5px 10px 5px;
             font-style: italic;
-            font-size: 1.1em;
             white-space: pre-wrap;
             border: 1px solid #EEE;
             border-radius: 5px;

langfun/core/message_test.py

@@ -380,7 +380,6 @@ class MessageTest(unittest.TestCase):
                 padding: 20px;
                 margin: 10px 5px 10px 5px;
                 font-style: italic;
-                font-size: 1.1em;
                 white-space: pre-wrap;
                 border: 1px solid #EEE;
                 border-radius: 5px;

langfun/core/structured/schema.py

@@ -201,7 +201,7 @@ class Schema(
   ):
     return pg.Html.element(
         'div',
-        [self.schema_str(protocol='python')],
+        [pg.Html.escape(self.schema_str(protocol='python'))],
         css_classes=['lf-schema-definition']
     ).add_style(
         """

{langfun-0.1.2.dev202412100804.dist-info → langfun-0.1.2.dev202412120804.dist-info}/METADATA

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

{langfun-0.1.2.dev202412100804.dist-info → langfun-0.1.2.dev202412120804.dist-info}/RECORD

@@ -13,8 +13,8 @@ langfun/core/language_model_test.py,sha256=hnYhtw7GM_TbhgsJzHNYTaoDewUlPHpOVlI7x
 langfun/core/logging.py,sha256=uslllP0RTGN223oro1m4nZZ0bFppcL07OwbFKm2iG6k,7519
 langfun/core/logging_test.py,sha256=b5bPTSUoYeICATaO6I8dOVumodwRbxSp1Oz96Sf3KcE,6104
 langfun/core/memory.py,sha256=f-asN1F7Vehgdn_fK84v73GrEUOxRtaW934keutTKjk,2416
-langfun/core/message.py,sha256=tRHEx-oGt325epJ836C4LoRFVWdfV2_Xcg0Qwrau2rs,25716
-langfun/core/message_test.py,sha256=v_BVCC5Ia-izwOBvKlw3waDJnKi0g4C68dc_cwlB1Vs,32611
+langfun/core/message.py,sha256=16oiMpg9O9VKrgpfrvJrfvga3n3FzUuD_zdWb9nvSWA,25686
+langfun/core/message_test.py,sha256=jtZoNBNbA99i2fjoKg5vTRgoUe84J4MH8ZMGakGmTHs,32577
 langfun/core/modality.py,sha256=K8pUGuMpfWcOtVcXC_OqVjro1-RhHF6ddQni61DuYzM,4166
 langfun/core/modality_test.py,sha256=7SwhixFME2Q1sIXRgJx97EZFiIyC31A9NVr6_nDtFv4,2441
 langfun/core/natural_language.py,sha256=3ynSnaYQnjE60LIPK5fyMgdIjubnPYZwzGq4rWPeloE,1177
@@ -30,10 +30,10 @@ langfun/core/template_test.py,sha256=Qokz1hQFhRYaTZWBWGqvPJ0NXC9B9ennUpnRYHEf0hE
 langfun/core/text_formatting.py,sha256=d7t9vaY6aCn1dkfkikpNYnBy5E_i93vHbfyDWFclGZU,5284
 langfun/core/text_formatting_test.py,sha256=ck0Xzdd4YF4CtCUj7VE0GybfbAyKQ8p3xkM1FBGrqIk,2096
 langfun/core/agentic/__init__.py,sha256=ndoDX0sAYsa3eVdXuu6nB-a-BH5TaK3urW6zAaFiyVs,1110
-langfun/core/agentic/action.py,sha256=jCVxTULwEi78ggg6lTDI7U1ejHzOvak_3FeAI-Td3Y0,26277
+langfun/core/agentic/action.py,sha256=QZPKRU31m0qr7R7LBtx0B7I1ZOgqf-CSrXf9Mf11CTo,26253
 langfun/core/agentic/action_eval.py,sha256=ZtjTh34S7XPIUqandQ0YwAtzw-S7ofuZ7rRXnRbUMdQ,4424
 langfun/core/agentic/action_eval_test.py,sha256=tRUkWmOE9p0rpNOq19xAY2oDEnYsEEykjg6sUpAwJk0,2832
-langfun/core/agentic/action_test.py,sha256=gVafU2akdrkEu2G4VaDDmXSYKNSkO1trghgcb1nDfIA,4591
+langfun/core/agentic/action_test.py,sha256=LkRTAa1zv8zavnkvCQEovKbKilVN5VNcqpK4shAcc1E,4637
 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=WiBdoScL-6C___iA3Tg3vizuYtJWI-_4wy9zcMfVpj8,7020
@@ -60,7 +60,7 @@ langfun/core/eval/scoring_test.py,sha256=O8olHbrUEg60gMxwOkWzKBJZpZoUlmVnBANX5Se
 langfun/core/eval/v2/__init__.py,sha256=XMpkKjd_vL_qzCQYPAwR1NNO0T_Zo5j4kP3eYL-EJLc,1428
 langfun/core/eval/v2/checkpointing.py,sha256=AhChb5U0fTd0NmDHaIaVE9qJ8zFEe7Lhq7KjIt1D2pQ,3766
 langfun/core/eval/v2/checkpointing_test.py,sha256=xU5asikwUn-rCmNd93ssvT6gDiKvvWogYKQa0r_TqOM,3046
-langfun/core/eval/v2/evaluation.py,sha256=hausa1NnUGi56KNrucd61qv9km1eDvcj2GBqiJzb0FA,19371
+langfun/core/eval/v2/evaluation.py,sha256=h_AWRUSKhEs-bHLBgqo-GeBYXluD5bPbAqypRW0ajfA,19441
 langfun/core/eval/v2/evaluation_test.py,sha256=hh6L2HhQPQ6NBv1pXKcNkYraNcV9MLuJ--69t9jbmaI,5846
 langfun/core/eval/v2/example.py,sha256=fURrvdNmMsVMqoEErcsmLmC6Xq3ny16dYsnLH8HVlcY,9626
 langfun/core/eval/v2/example_test.py,sha256=WcJmU7IQQXvjFia63mokySC4CqxzVL9Wso1sC5F0YK8,3032
@@ -96,7 +96,7 @@ langfun/core/llms/openai.py,sha256=l49v6RubfInvV0iG114AymTKNogTX4u4N-UFCeSgIxw,2
 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=BkhRKnr20gIJvRL8G-KwTT7EM7v7L-pXkBkPeRkEFFY,14184
+langfun/core/llms/vertexai.py,sha256=bwOJGuTSsQHqNoa6UIXhk6MUkyMd_b6dzd3Txrw3Rps,14565
 langfun/core/llms/vertexai_test.py,sha256=ffcA5yPecnQy_rhkuYAw_6o1iLW8AR8FgswmHt6aAys,6725
 langfun/core/llms/cache/__init__.py,sha256=QAo3InUMDM_YpteNnVCSejI4zOsnjSMWKJKzkb3VY64,993
 langfun/core/llms/cache/base.py,sha256=rt3zwmyw0y9jsSGW-ZbV1vAfLxQ7_3AVk0l2EySlse4,3918
@@ -131,7 +131,7 @@ langfun/core/structured/parsing.py,sha256=D58wBWOC6r6DCJNychCDkiHPrsy1XJfBDCDDZt
 langfun/core/structured/parsing_test.py,sha256=i0i090FVgM8ngGqYjds0hjEm1v7q4gv18k-z1kaNr7E,21467
 langfun/core/structured/prompting.py,sha256=vvPZcB0OL_kQMwyCUe4r4Q77luHT_OwVX3DeILN0hNw,16564
 langfun/core/structured/prompting_test.py,sha256=TFqerzK5RFlYyNL-X4wrhY-vOjF_XEpHX3nbSNuNKxg,29720
-langfun/core/structured/schema.py,sha256=XHA-m_ENT_J0k8Q7WCiCL51xm7oXHOqskhO8RpPIurc,28174
+langfun/core/structured/schema.py,sha256=_T8WIDdpvWXlZVPLVgKYH9TvoM9gK11m3f0b2nImQRM,28190
 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
@@ -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.dev202412100804.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-langfun-0.1.2.dev202412100804.dist-info/METADATA,sha256=IcDza3RsE6fuifE64s71Jo-T4LoROCzQ3mYHo8NCNko,8281
-langfun-0.1.2.dev202412100804.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
-langfun-0.1.2.dev202412100804.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
-langfun-0.1.2.dev202412100804.dist-info/RECORD,,
+langfun-0.1.2.dev202412120804.dist-info/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+langfun-0.1.2.dev202412120804.dist-info/METADATA,sha256=OTHTCXZcoQyoFOUiSZqyvA1XirxpyusZ3GUjHXqi8s4,8281
+langfun-0.1.2.dev202412120804.dist-info/WHEEL,sha256=PZUExdf71Ui_so67QXpySuHtCi3-J3wvF4ORK6k_S8U,91
+langfun-0.1.2.dev202412120804.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
+langfun-0.1.2.dev202412120804.dist-info/RECORD,,