langfun 0.1.2.dev202505050805__tar.gz → 0.1.2.dev202505060804__tar.gz

{langfun-0.1.2.dev202505050805 → langfun-0.1.2.dev202505060804}/PKG-INFO

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

{langfun-0.1.2.dev202505050805 → langfun-0.1.2.dev202505060804}/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-0.1.2.dev202505050805 → langfun-0.1.2.dev202505060804}/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-0.1.2.dev202505050805 → langfun-0.1.2.dev202505060804}/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-0.1.2.dev202505050805 → langfun-0.1.2.dev202505060804}/langfun/core/llms/gemini.py

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

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