langfun 0.1.2.dev202505040804__py3-none-any.whl → 0.1.2.dev202505060804__py3-none-any.whl

langfun/core/agentic/action.py

@@ -194,6 +194,11 @@ class Action(pg.Object):
     """Returns the metadata associated with the result from previous call."""
     return self._invocation.metadata if self._invocation else None
 
+  @property
+  def invocation(self) -> Optional['ActionInvocation']:
+    """Returns last invocation. None if the action is not executed."""
+    return self._invocation
+
   def __call__(
       self,
       session: Optional['Session'] = None,
@@ -825,6 +830,7 @@ class ActionInvocation(pg.Object, pg.views.html.HtmlTreeView.Extension):
   def _on_bound(self):
     super()._on_bound()
     self._tab_control = None
+    self.action._invocation = self    # pylint: disable=protected-access
 
   def _on_parent_change(self, *args, **kwargs):
     super()._on_parent_change(*args, **kwargs)
@@ -1154,7 +1160,6 @@ class Session(pg.Object, pg.views.html.HtmlTreeView.Extension):
       )
 
     invocation = ActionInvocation(pg.maybe_ref(action))
-    action._invocation = invocation  # pylint: disable=protected-access
     parent_action = self._current_action
     parent_execution = self._current_execution
     parent_execution.append(invocation)
@@ -1412,38 +1417,103 @@ class Session(pg.Object, pg.views.html.HtmlTreeView.Extension):
       level: lf.logging.LogLevel,
       message: str,
       keep: bool,
+      *,
+      for_action: Action | ActionInvocation | None = None,
       **kwargs
   ) -> None:
-    """Logs a message to the session."""
-    action_name = self._current_action.action.__class__.__name__
+    """Logs a message to the session.
+
+    Args:
+      level: The logging level.
+      message: The message to log.
+      keep: Whether to keep the log entry in the execution trace.
+      for_action: The action to log the message for. If not provided, the
+        current action will be used.
+      **kwargs: Additional keyword arguments to pass to `lf.logging.log` as
+        metadata to show.
+    """
     execution = self._current_execution
+    if for_action is None:
+      for_action = self._current_action
+    elif isinstance(for_action, Action):
+      for_action = for_action.invocation
+      assert for_action is not None
+
     log_entry = lf.logging.log(
         level,
-        f'[{execution.id} ({action_name})]: {message}',
+        (
+            f'[{for_action.id} ({for_action.action.__class__.__name__})]: '
+            f'{message}'
+        ),
         **kwargs
     )
     if keep:
       execution.append(log_entry)
 
-  def debug(self, message: str, keep: bool = True, **kwargs):
+  def debug(
+      self,
+      message: str,
+      keep: bool = True,
+      *,
+      for_action: Action | ActionInvocation | None = None,
+      **kwargs
+  ) -> None:
     """Logs a debug message to the session."""
-    self._log('debug', message, keep=keep, **kwargs)
+    self._log(
+        'debug', message, keep=keep, for_action=for_action, **kwargs
+    )
 
-  def info(self, message: str, keep: bool = True, **kwargs):
+  def info(
+      self,
+      message: str,
+      keep: bool = True,
+      *,
+      for_action: Action | ActionInvocation | None = None,
+      **kwargs
+  ) -> None:
     """Logs an info message to the session."""
-    self._log('info', message, keep=keep, **kwargs)
+    self._log(
+        'info', message, keep=keep, for_action=for_action, **kwargs
+    )
 
-  def warning(self, message: str, keep: bool = True, **kwargs):
+  def warning(
+      self,
+      message: str,
+      keep: bool = True,
+      *,
+      for_action: Action | ActionInvocation | None = None,
+      **kwargs
+  ) -> None:
     """Logs a warning message to the session."""
-    self._log('warning', message, keep=keep, **kwargs)
+    self._log(
+        'warning', message, keep=keep, for_action=for_action, **kwargs
+    )
 
-  def error(self, message: str, keep: bool = True, **kwargs):
+  def error(
+      self,
+      message: str,
+      keep: bool = True,
+      *,
+      for_action: Action | ActionInvocation | None = None,
+      **kwargs
+  ):
     """Logs an error message to the session."""
-    self._log('error', message, keep=keep, **kwargs)
+    self._log(
+        'error', message, keep=keep, for_action=for_action, **kwargs
+    )
 
-  def fatal(self, message: str, **kwargs):
+  def fatal(
+      self,
+      message: str,
+      keep: bool = True,
+      *,
+      for_action: Action | ActionInvocation | None = None,
+      **kwargs
+  ):
     """Logs a fatal message to the session."""
-    self._log('fatal', message, keep=True, **kwargs)
+    self._log(
+        'fatal', message, keep=keep, for_action=for_action, **kwargs
+    )
 
   def as_message(self) -> lf.AIMessage:
     """Returns the session as a message."""

langfun/core/agentic/action_test.py

@@ -107,6 +107,7 @@ class SessionTest(unittest.TestCase):
     lm = fake.StaticResponse('lm response')
     foo = Foo(1)
     self.assertIsNone(foo.session)
+    self.assertIsNone(foo.invocation)
     self.assertIsNone(foo.result)
     self.assertIsNone(foo.metadata)
 
@@ -167,6 +168,7 @@ class SessionTest(unittest.TestCase):
 
     # Inspecting the top-level action (Foo)
     foo_invocation = root.execution[0]
+    self.assertIs(foo.invocation, foo_invocation)
     self.assertIs(foo_invocation.parent_action, root)
     self.assertEqual(foo_invocation.id, 'agent@1:/a1')
     self.assertEqual(foo_invocation.execution.id, 'agent@1:/a1')
@@ -414,8 +416,8 @@ class SessionTest(unittest.TestCase):
   def test_log(self):
     session = action_lib.Session()
     session.debug('hi', x=1, y=2)
-    session.info('hi', x=1, y=2)
-    session.warning('hi', x=1, y=2)
+    session.info('hi', x=1, y=2, for_action=session.root)
+    session.warning('hi', x=1, y=2, for_action=session.root.action)
     session.error('hi', x=1, y=2)
     session.fatal('hi', x=1, y=2)
 

langfun/core/language_model.py

@@ -213,7 +213,8 @@ class ModelInfo(pg.Object):
         return None
       return (
           self.cost_per_1m_input_tokens * usage.prompt_tokens
-          + self.cost_per_1m_output_tokens * usage.completion_tokens
+          + self.cost_per_1m_output_tokens
+          * (usage.total_tokens - usage.prompt_tokens)
       ) / 1000_000
 
   pricing: Annotated[

langfun/core/llms/__init__.py

@@ -87,6 +87,7 @@ VertexAIGeminiFlash1_5 = VertexAIGemini15Flash
 # OpenAI models.
 from langfun.core.llms.openai import OpenAI
 
+from langfun.core.llms.openai import Gpt41
 from langfun.core.llms.openai import GptO3
 from langfun.core.llms.openai import GptO4Mini
 from langfun.core.llms.openai import Gpt45Preview_20250227

langfun/core/llms/gemini.py

@@ -133,7 +133,7 @@ class GeminiModelInfo(lf.ModelInfo):
           self.cost_per_1m_input_tokens_with_prompt_longer_than_128k
           * usage.prompt_tokens
           + self.cost_per_1m_output_tokens_with_prompt_longer_than_128k
-          * usage.completion_tokens
+          * (usage.total_tokens - usage.prompt_tokens)
       ) / 1000_000
 
   experimental: Annotated[
@@ -657,7 +657,7 @@ class Gemini(rest.REST):
   def result(self, json: dict[str, Any]) -> lf.LMSamplingResult:
     messages = [
         lf.Message.from_value(candidate['content'], format='gemini')
-        for candidate in json['candidates']
+        for candidate in json.get('candidates', [])
     ]
     usage = json['usageMetadata']
     input_tokens = usage['promptTokenCount']

langfun/core/llms/openai.py

@@ -49,6 +49,30 @@ class OpenAIModelInfo(lf.ModelInfo):
 #
 
 SUPPORTED_MODELS = [
+    # GPT-4.1 models
+    OpenAIModelInfo(
+        model_id='gpt-4.1',
+        alias_for='gpt-4.1-2025-04-14',
+        in_service=True,
+        model_type='instruction-tuned',
+        description='GPT 4.1 model (latest stable).',
+        url='https://platform.openai.com/docs/models/gpt-4.1',
+        input_modalities=OpenAIModelInfo.INPUT_IMAGE_TYPES,
+        context_length=lf.ModelInfo.ContextLength(
+            max_input_tokens=1_047_576,
+            max_output_tokens=32_768,
+        ),
+        pricing=lf.ModelInfo.Pricing(
+            cost_per_1m_cached_input_tokens=0.50,
+            cost_per_1m_input_tokens=2.0,
+            cost_per_1m_output_tokens=8.0,
+        ),
+        # Tier 5 rate limits.
+        rate_limits=lf.ModelInfo.RateLimits(
+            max_requests_per_minute=10_000,
+            max_tokens_per_minute=30_000_000,
+        ),
+    ),
     # o3 models.
     OpenAIModelInfo(
         model_id='o3',
@@ -1045,6 +1069,11 @@ class OpenAI(openai_compatible.OpenAICompatible):
     return super()._request_args(options)
 
 
+class Gpt41(OpenAI):
+  """GPT-4.1."""
+  model = 'gpt-4.1'
+
+
 class GptO4Mini(OpenAI):
   """GPT O4 mini."""
 

{langfun-0.1.2.dev202505040804.dist-info → langfun-0.1.2.dev202505060804.dist-info}/METADATA

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

{langfun-0.1.2.dev202505040804.dist-info → langfun-0.1.2.dev202505060804.dist-info}/RECORD

@@ -8,7 +8,7 @@ langfun/core/console.py,sha256=V_mOiFi9oGh8gLsUeR56pdFDkuvYOpvQt7DY1KUTWTA,2535
 langfun/core/console_test.py,sha256=pBOcuNMJdVELywvroptfcRtJMsegMm3wSlHAL2TdxVk,1679
 langfun/core/langfunc.py,sha256=G50YgoVZ0y1GFw2ev41MlOqr6qa8YakbvNC0h_E0PiA,11140
 langfun/core/langfunc_test.py,sha256=CDn-gJCa5EnjN7cotAVCfSCbuzddq2o-HzEt7kV8HbY,8882
-langfun/core/language_model.py,sha256=_hT8dGHw7CWQgMTQ-Ons5VTOwpF_j8k_gn2P0hoG-lE,46307
+langfun/core/language_model.py,sha256=c6Vds9qXuC0BiHeZstxCTTsoU8ZL9K4w4co_hXA3-RI,46336
 langfun/core/language_model_test.py,sha256=iA5uo7rIj2jAtCYzMzhyNg1fWqE2Onn60bOO58q72C0,36454
 langfun/core/logging.py,sha256=ypjSwGzQpIhadewEKkIH5VWS55rfU4e6mlni41PMHlw,9116
 langfun/core/logging_test.py,sha256=vbVGOQxwMmVSiFfbt2897gUt-8nqDpV64jCAeUG_q5U,6924
@@ -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=3m2-k07Zz8qrzOdOa7xPl7fRH3I0c3VsMLR86_JBCcU,45359
+langfun/core/agentic/action.py,sha256=jxjW4vkJs3p-AYb83P0AVnmE93Vx7z0QoFsm40NQ65k,46853
 langfun/core/agentic/action_eval.py,sha256=JXhS5qEjWu9EZ0chDsjWxCqPAV26PUCBijtUYxiDeO4,4975
 langfun/core/agentic/action_eval_test.py,sha256=7AkOwNbUX-ZgR1R0a7bvUZ5abNTUV7blf_8Mnrwb-II,2811
-langfun/core/agentic/action_test.py,sha256=ezqg3tKlVwgLMnHKUmOdtxpnntuL8YIvhcTCSSdb8oc,15468
+langfun/core/agentic/action_test.py,sha256=wrx7_JUyL6EXhJeUqmPkPyIwOAh_KwTOWhSRgv2wYWo,15613
 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=7zBedlhQKMPA4cfchUMxAOFl6Zl5RqCyllRHGWys40s,7092
@@ -81,7 +81,7 @@ langfun/core/eval/v2/reporting.py,sha256=yUIPCAMnp7InIzpv1DDWrcLO-75iiOUTpscj7sm
 langfun/core/eval/v2/reporting_test.py,sha256=hcPJJaMtPulqERvHYTpId83WXdqDKnnexmULtK7WKwk,5686
 langfun/core/eval/v2/runners.py,sha256=8PGNlpqSGCW4O-z0E9SHcLklZNceAzwbS7letstljPE,16652
 langfun/core/eval/v2/runners_test.py,sha256=A37fKK2MvAVTiShsg_laluJzJ9AuAQn52k7HPbfD0Ks,11666
-langfun/core/llms/__init__.py,sha256=0XyDya5doAIK_8Fjw_a78El-eBf63ggJMY8vICtQMtw,8495
+langfun/core/llms/__init__.py,sha256=Fr4ScBDvWnfZQvdoUIlmdEG02zkWAvj8DxsFGsiV4mo,8538
 langfun/core/llms/anthropic.py,sha256=qaclpfX3qeHoZMDxU3Gn-638Vi4IyCbxdow3zgGUHK4,22195
 langfun/core/llms/anthropic_test.py,sha256=dFnNvrgwCYUseDuiuWCBoQ5jloYX9RIlZQf7cCLPNU4,8282
 langfun/core/llms/azure_openai.py,sha256=-KkSLaR54MlsIqz_XIwv0TnsBnvNTAxnjA2Q2O2u5KM,2733
@@ -92,7 +92,7 @@ langfun/core/llms/deepseek.py,sha256=jvTxdXPr-vH6HNakn_Ootx1heDg8Fen2FUkUW36bpCs
 langfun/core/llms/deepseek_test.py,sha256=DvROWPlDuow5E1lfoSkhyGt_ELA19JoQoDsTnRgDtTg,1847
 langfun/core/llms/fake.py,sha256=xmgCkk9y0I4x0IT32SZ9_OT27aLadXH8PRiYNo5VTd4,3265
 langfun/core/llms/fake_test.py,sha256=2h13qkwEz_JR0mtUDPxdAhQo7MueXaFSwsD2DIRDW9g,7653
-langfun/core/llms/gemini.py,sha256=ZtUo2lQMSByYlzSALWae3KxFiKNtOOwGbkFwZTI1dO0,24472
+langfun/core/llms/gemini.py,sha256=S9TT_p-UWTdYnyUzQa1pnrvAu9SnFu2E2V2suxJ_3SU,24499
 langfun/core/llms/gemini_test.py,sha256=Ve9X2Wvwu9wVFHpKZDP-qoM1_hzB4kgt6_HR9wxtNkg,7592
 langfun/core/llms/google_genai.py,sha256=j8W22WFvkT80Fw-r7Rg-e7MKhcSwljZkmtuufwSEn5s,5051
 langfun/core/llms/google_genai_test.py,sha256=NKNtpebArQ9ZR7Qsnhd2prFIpMjleojy6o6VMXkJ1zY,1502
@@ -100,7 +100,7 @@ langfun/core/llms/groq.py,sha256=S9V10kFo3cgX89qPgt_umq-SpRnxEDLTt_hJmpERfbo,120
 langfun/core/llms/groq_test.py,sha256=P4EgexCqsh4K2x11w0UL_vz-YYNaPdQU0WsDAdnTRQ8,2045
 langfun/core/llms/llama_cpp.py,sha256=Z7P3gc4xeIjc2bX0Ey1y5EUYJVMnMa2Q67PZ9iye9sE,1409
 langfun/core/llms/llama_cpp_test.py,sha256=wfTO7nmUwL65U2kK9P9fcMt92JjNDuVia4G1E7znf_4,1086
-langfun/core/llms/openai.py,sha256=F3vQkLVKeKhm34e2akqryuhjl7uOefAANUN3_i4SVhM,41414
+langfun/core/llms/openai.py,sha256=LxENwsuGh-h1LXMu2Ub8Rjp1g1WNpm1NHBrwhkD-M4Q,42333
 langfun/core/llms/openai_compatible.py,sha256=JlFUTiK4e3ox2DGeGBcAD-cXkxmBdx5g6LrYkyMIaps,5777
 langfun/core/llms/openai_compatible_test.py,sha256=KwOMA7tsmOxFBjezltkBDSU77AvOQkI23dO2nHLAlB4,17689
 langfun/core/llms/openai_test.py,sha256=gwuO6aoa296iM2welWV9ua4KF8gEVGsEPakgbtkWkFQ,2687
@@ -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.dev202505040804.dist-info/licenses/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-langfun-0.1.2.dev202505040804.dist-info/METADATA,sha256=5IYkqanozH8dVb3Nr0bH2jmybe-FPKrvx7-nAEPNCeM,8178
-langfun-0.1.2.dev202505040804.dist-info/WHEEL,sha256=GHB6lJx2juba1wDgXDNlMTyM13ckjBMKf-OnwgKOCtA,91
-langfun-0.1.2.dev202505040804.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
-langfun-0.1.2.dev202505040804.dist-info/RECORD,,
+langfun-0.1.2.dev202505060804.dist-info/licenses/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+langfun-0.1.2.dev202505060804.dist-info/METADATA,sha256=nWF0YcXH9lFbXYgzHPjf7Dr_qqw223Kt230LtPpsGEA,8178
+langfun-0.1.2.dev202505060804.dist-info/WHEEL,sha256=0CuiUZ_p9E4cD6NyLD6UG80LBXYyiSYZOKDm5lp32xk,91
+langfun-0.1.2.dev202505060804.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
+langfun-0.1.2.dev202505060804.dist-info/RECORD,,

{langfun-0.1.2.dev202505040804.dist-info → langfun-0.1.2.dev202505060804.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (80.3.0)
+Generator: setuptools (80.3.1)
 Root-Is-Purelib: true
 Tag: py3-none-any