langfun 0.1.2.dev202412100804__tar.gz → 0.1.2.dev202412120804__tar.gz

{langfun-0.1.2.dev202412100804 → langfun-0.1.2.dev202412120804}/PKG-INFO

@@ -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 → langfun-0.1.2.dev202412120804}/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-0.1.2.dev202412100804 → langfun-0.1.2.dev202412120804}/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-0.1.2.dev202412100804 → langfun-0.1.2.dev202412120804}/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-0.1.2.dev202412100804 → langfun-0.1.2.dev202412120804}/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-0.1.2.dev202412100804 → langfun-0.1.2.dev202412120804}/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-0.1.2.dev202412100804 → langfun-0.1.2.dev202412120804}/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-0.1.2.dev202412100804 → langfun-0.1.2.dev202412120804}/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 → langfun-0.1.2.dev202412120804}/langfun.egg-info/PKG-INFO

@@ -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