langfun 0.1.2.dev202505140804__tar.gz → 0.1.2.dev202505160805__tar.gz

{langfun-0.1.2.dev202505140804 → langfun-0.1.2.dev202505160805}/PKG-INFO

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

{langfun-0.1.2.dev202505140804 → langfun-0.1.2.dev202505160805}/langfun/core/agentic/action.py

@@ -898,6 +898,11 @@ class ActionInvocation(pg.Object, pg.views.html.HtmlTreeView.Extension):
     """Returns the usage summary of the action."""
     return self.execution.usage_summary
 
+  @property
+  def elapse(self) -> float:
+    """Returns the elapsed time of the action."""
+    return self.execution.elapse
+
   def start(self) -> None:
     """Starts the execution of the action."""
     self.execution.start()
@@ -1088,6 +1093,60 @@ class Session(pg.Object, pg.views.html.HtmlTreeView.Extension):
       )
   ] = False
 
+  #
+  # Shortcut methods for accessing the root action invocation.
+  #
+
+  @property
+  def all_queries(self) -> list[lf_structured.QueryInvocation]:
+    """Returns all queries made by the session."""
+    return self.root.all_queries
+
+  @property
+  def all_actions(self) -> list[ActionInvocation]:
+    """Returns all actions made by the session."""
+    return self.root.all_actions
+
+  @property
+  def all_logs(self) -> list[lf.logging.LogEntry]:
+    """Returns all logs made by the session."""
+    return self.root.all_logs
+
+  @property
+  def usage_summary(self) -> lf.UsageSummary:
+    """Returns the usage summary of the session."""
+    return self.root.usage_summary
+
+  @property
+  def has_started(self) -> bool:
+    """Returns True if the session has started."""
+    return self.root.execution.has_started
+
+  @property
+  def has_stopped(self) -> bool:
+    """Returns True if the session has stopped."""
+    return self.root.execution.has_stopped
+
+  @property
+  def has_error(self) -> bool:
+    """Returns True if the session has an error."""
+    return self.root.has_error
+
+  @property
+  def final_result(self) -> Any:
+    """Returns the final result of the session."""
+    return self.root.result
+
+  @property
+  def final_error(self) -> pg.utils.ErrorInfo | None:
+    """Returns the error of the session."""
+    return self.root.error
+
+  @property
+  def elapse(self) -> float:
+    """Returns the elapsed time of the session."""
+    return self.root.elapse
+
   # NOTE(daiyip): Action execution may involve multi-threading, hence current
   # action and execution are thread-local.
 
@@ -1131,6 +1190,20 @@ class Session(pg.Object, pg.views.html.HtmlTreeView.Extension):
       metadata: dict[str, Any] | None = None,
   ) -> None:
     """Ends the session."""
+    if error is not None:
+      self.error(
+          f'Trajectory failed in {self.elapse:.2f} seconds.',
+          error=error,
+          metadata=metadata,
+          keep=True,
+      )
+    elif self.verbose:
+      self.info(
+          f'Trajectory succeeded in {self.elapse:.2f} seconds.',
+          result=result,
+          metadata=metadata,
+          keep=False,
+      )
     self.root.end(result, error, metadata)
 
   def __enter__(self):
@@ -1191,26 +1264,15 @@ class Session(pg.Object, pg.views.html.HtmlTreeView.Extension):
       yield invocation
     finally:
       if invocation.has_error:
-        if invocation.parent_action is self.root:
-          self.error(
-              (
-                  f'Top-level action execution failed in '
-                  f'{invocation.execution.elapse:.2f} seconds.'
-              ),
-              action=invocation.action,
-              error=invocation.error,
-              keep=True,
-          )
-        else:
-          self.warning(
-              (
-                  f'Action execution failed in '
-                  f'{invocation.execution.elapse:.2f} seconds.'
-              ),
-              action=invocation.action,
-              error=invocation.error,
-              keep=True,
-          )
+        self.warning(
+            (
+                f'Action execution failed in '
+                f'{invocation.execution.elapse:.2f} seconds.'
+            ),
+            action=invocation.action,
+            error=invocation.error,
+            keep=True,
+        )
       elif self.verbose:
         self.info(
             (
@@ -1522,7 +1584,9 @@ class Session(pg.Object, pg.views.html.HtmlTreeView.Extension):
       for_action = self._current_action
     elif isinstance(for_action, Action):
       for_action = for_action.invocation
-      assert for_action is not None
+      assert for_action is not None, (
+          f'Action must be called before it can be logged: {for_action}'
+      )
 
     log_entry = lf.logging.log(
         level,
@@ -1607,26 +1671,6 @@ class Session(pg.Object, pg.views.html.HtmlTreeView.Extension):
         result=self.root
     )
 
-  @property
-  def final_result(self) -> Any:
-    """Returns the final result of the session."""
-    return self.root.result
-
-  @property
-  def has_started(self) -> bool:
-    """Returns whether the session has started."""
-    return self.root.execution.has_started
-
-  @property
-  def has_stopped(self) -> bool:
-    """Returns whether the session has stopped."""
-    return self.root.execution.has_stopped
-
-  @property
-  def has_error(self) -> bool:
-    """Returns whether the session has an error."""
-    return self.root.has_error
-
   @property
   def current_action(self) -> ActionInvocation:
     """Returns the current invocation."""

{langfun-0.1.2.dev202505140804 → langfun-0.1.2.dev202505160805}/langfun/core/agentic/action_test.py

@@ -155,15 +155,19 @@ class SessionTest(unittest.TestCase):
     )
 
     # The root space should have one action (foo), no queries, and no logs.
-    self.assertEqual(len(list(root.actions)), 1)
-    self.assertEqual(len(list(root.queries)), 0)
-    self.assertEqual(len(list(root.logs)), 0)
+    self.assertEqual(len(root.actions), 1)
+    self.assertEqual(len(root.queries), 0)
+    self.assertEqual(len(root.logs), 0)
     # 1 query from Bar, 2 from Foo and 3 from parallel executions.
-    self.assertEqual(len(list(root.all_queries)), 6)
+    self.assertEqual(len(session.all_queries), 6)
+    self.assertEqual(len(root.all_queries), 6)
     # 2 actions: Foo and Bar.
-    self.assertEqual(len(list(root.all_actions)), 2)
+    self.assertEqual(len(session.all_actions), 2)
+    self.assertEqual(len(root.all_actions), 2)
     # 1 log from Bar and 1 from Foo.
-    self.assertEqual(len(list(root.all_logs)), 2)
+    self.assertEqual(len(session.all_logs), 2)
+    self.assertEqual(len(root.all_logs), 2)
+    self.assertIs(session.usage_summary, root.usage_summary)
     self.assertEqual(root.usage_summary.total.num_requests, 6)
 
     # Inspecting the top-level action (Foo)
@@ -276,7 +280,7 @@ class SessionTest(unittest.TestCase):
     foo_invocation = root.execution[0]
     self.assertIsInstance(foo_invocation, action_lib.ActionInvocation)
     self.assertTrue(foo_invocation.has_error)
-    self.assertEqual(len(foo_invocation.execution.items), 2)
+    self.assertEqual(len(foo_invocation.execution.items), 3)
 
   def test_succeeded_with_implicit_session(self):
     lm = fake.StaticResponse('lm response')
@@ -304,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.root.error, pg.utils.ErrorInfo)
+    self.assertIsInstance(session.final_error, pg.utils.ErrorInfo)
     self.assertIn('Bar error', str(session.root.error))
 
   def test_succeeded_with_explicit_session(self):
@@ -409,7 +413,9 @@ class SessionTest(unittest.TestCase):
     self.assertTrue(session.has_stopped)
     self.assertTrue(session.has_error)
     self.assertIsInstance(session.root.error, pg.utils.ErrorInfo)
-    self.assertEqual(len(session.root.execution), 2)
+    self.assertEqual(len(session.root.execution), 3)
+    self.assertEqual(len(session.root.actions), 2)
+    self.assertEqual(len(session.root.logs), 1)
     self.assertFalse(session.root.execution[0].has_error)
     self.assertTrue(session.root.execution[1].has_error)
 

{langfun-0.1.2.dev202505140804 → langfun-0.1.2.dev202505160805}/langfun/core/eval/v2/metrics_test.py

@@ -37,7 +37,7 @@ class MatchTest(unittest.TestCase):
             Example(
                 id=3,
                 input=pg.Dict(groundtruth=1),
-                error=pg.object_utils.ErrorInfo(
+                error=pg.symbolic.ErrorInfo(
                     tag='ValueError',
                     description='Bad input.',
                     stacktrace='...',
@@ -51,7 +51,7 @@ class MatchTest(unittest.TestCase):
             Example(
                 id=3,
                 input=pg.Dict(groundtruth=1),
-                error=pg.object_utils.ErrorInfo(
+                error=pg.symbolic.ErrorInfo(
                     tag='MappingError.CodeError',
                     description='Bad input.',
                     stacktrace='...',
@@ -130,7 +130,7 @@ class ScoreTest(unittest.TestCase):
             Example(
                 id=3,
                 input=pg.Dict(x=1),
-                error=pg.object_utils.ErrorInfo(
+                error=pg.symbolic.ErrorInfo(
                     tag='ValueError',
                     description='Bad input.',
                     stacktrace='...',
@@ -144,7 +144,7 @@ class ScoreTest(unittest.TestCase):
             Example(
                 id=3,
                 input=pg.Dict(x=1),
-                error=pg.object_utils.ErrorInfo(
+                error=pg.symbolic.ErrorInfo(
                     tag='MappingError.CodeError',
                     description='Bad input.',
                     stacktrace='...',

{langfun-0.1.2.dev202505140804 → langfun-0.1.2.dev202505160805}/langfun/core/llms/anthropic.py

@@ -509,17 +509,13 @@ class Anthropic(rest.REST):
           raise ValueError(f'Unsupported modality: {chunk!r}.')
       return chunk
 
-    messages = []
     if system_message := prompt.get('system_message'):
       assert isinstance(system_message, lf.SystemMessage), type(system_message)
-      messages.append(
-          system_message.as_format(
-              'anthropic', chunk_preprocessor=modality_check
-          )
-      )
-    messages.append(
+      request['system'] = system_message.text
+
+    messages = [
         prompt.as_format('anthropic', chunk_preprocessor=modality_check)
-    )
+    ]
     request.update(messages=messages)
     return request
 

{langfun-0.1.2.dev202505140804 → langfun-0.1.2.dev202505160805}/langfun/core/llms/anthropic_test.py

@@ -31,21 +31,46 @@ def mock_requests_post(url: str, json: dict[str, Any], **kwargs):
 
   response = requests.Response()
   response.status_code = 200
+
+  # Construct base text from user/assistant messages payload
+  messages_payload_text = '\n'.join(
+      c['content'][0]['text']
+      for c in json.get('messages', [])
+      if c.get('content')
+      and isinstance(c['content'], list)
+      and c['content']
+      and c['content'][0].get('type') == 'text'
+      and 'text' in c['content'][0]
+  )
+
+  # Check for a system prompt in the request payload
+  system_prompt_text = json.get('system')
+
+  processed_text_parts = []
+  if system_prompt_text:
+    processed_text_parts.append(system_prompt_text)
+  if messages_payload_text:
+    processed_text_parts.append(messages_payload_text)
+
+  processed_text = '\n'.join(processed_text_parts)
+
+  response_content_text = (
+      f'{processed_text} with temperature={json.get("temperature")}, '
+      f'top_k={json.get("top_k")}, '
+      f'top_p={json.get("top_p")}, '
+      f'max_tokens={json.get("max_tokens")}, '
+      f'stop={json.get("stop_sequences")}.'
+  )
+
   response._content = pg.to_json_str({
-      'content': [{
-          'type': 'text',
-          'text': (
-              '\n'.join(c['content'][0]['text'] for c in json['messages']) +
-              f' with temperature={json.get("temperature")}, '
-              f'top_k={json.get("top_k")}, '
-              f'top_p={json.get("top_p")}, '
-              f'max_tokens={json.get("max_tokens")}, '
-              f'stop={json.get("stop_sequences")}.'
-          ),
-      }],
+      'content': [{'type': 'text', 'text': response_content_text}],
       'usage': {
-          'input_tokens': 2,
-          'output_tokens': 1,
+          'input_tokens': (
+              2
+          ),  # Placeholder: adjust if tests need accurate token counts
+          'output_tokens': (
+              1
+          ),  # Placeholder: adjust if tests need accurate token counts
       },
   }).encode()
   return response

{langfun-0.1.2.dev202505140804 → langfun-0.1.2.dev202505160805}/langfun/core/llms/gemini.py

@@ -155,7 +155,7 @@ SUPPORTED_MODELS = [
     GeminiModelInfo(
         model_id='gemini-2.5-pro-preview-05-06',
         in_service=True,
-        provider=pg.oneof(['Google GenAI', ' VertexAI']),
+        provider=pg.oneof(['Google GenAI', 'VertexAI']),
         model_type='instruction-tuned',
         description='Gemini 2.5 Pro.',
         release_date=datetime.datetime(2025, 5, 6),
@@ -178,7 +178,7 @@ SUPPORTED_MODELS = [
     GeminiModelInfo(
         model_id='gemini-2.5-flash-preview-04-17',
         in_service=True,
-        provider=pg.oneof(['Google GenAI', ' VertexAI']),
+        provider=pg.oneof(['Google GenAI', 'VertexAI']),
         model_type='instruction-tuned',
         description='Gemini 2.5 Flash.',
         release_date=datetime.datetime(2025, 4, 17),

{langfun-0.1.2.dev202505140804 → langfun-0.1.2.dev202505160805}/langfun/core/logging.py

@@ -276,7 +276,7 @@ def log(level: LogLevel,
       console_lib.write(entry)
   elif not console:
     if kwargs:
-      message = f'{message} (metadata: {pg.format(kwargs)})'
+      message = f'{message} (metadata: {pg.format(kwargs, verbose=False)})'
     system_log_func(level)(message)
   return entry
 

{langfun-0.1.2.dev202505140804 → langfun-0.1.2.dev202505160805}/langfun.egg-info/PKG-INFO

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