langfun 0.1.2.dev202504250804__py3-none-any.whl → 0.1.2.dev202504260803__py3-none-any.whl

langfun/core/agentic/action.py

@@ -15,7 +15,6 @@
 
 import abc
 import contextlib
-import datetime
 import threading
 import time
 import typing
@@ -55,7 +54,9 @@ class Action(pg.Object):
       session: Optional['Session'] = None,
       *,
       show_progress: bool = True,
-      **kwargs) -> Any:
+      verbose: bool = False,
+      **kwargs
+  ) -> Any:
     """Executes the action."""
     new_session = session is None
     if new_session:
@@ -64,11 +65,17 @@ class Action(pg.Object):
         lf.console.display(pg.view(session, name='agent_session'))
 
     with session.track_action(self):
-      pg.logging.info('Example %s starts action %s', session.id, repr(self))
-      result = self.call(session=session, **kwargs)
-      pg.logging.info(
-          'Example %s ends action %s', session.id, self.__class__.__name__
-      )
+      if verbose:
+        session.info(f'Executing action {self!r}...', keep=False)
+
+      result = self.call(session=session, verbose=verbose, **kwargs)
+
+      if verbose:
+        session.info(
+            f'Action {self.__class__.__name__} completed successfully.',
+            keep=False,
+            result=result
+        )
 
       # For the top-level action, we store the session in the metadata.
       if new_session:
@@ -798,7 +805,10 @@ class Session(pg.Object, pg.views.html.HtmlTreeView.Extension):
     self._current_action = self.root
     self._current_execution = self.root.execution
     if self.id is None:
-      self.rebind(id=uuid.uuid4().hex[-7:], skip_notification=True)
+      self.rebind(
+          id=f'session@{uuid.uuid4().hex[-7:]}',
+          skip_notification=True
+      )
 
   #
   # Context-manager for information tracking.
@@ -1051,35 +1061,39 @@ class Session(pg.Object, pg.views.html.HtmlTreeView.Extension):
     with self.track_queries():
       return lf_structured.query_output(response, schema=schema, **kwargs)
 
-  def _log(self, level: lf.logging.LogLevel, message: str, **kwargs):
-    self._current_execution.append(
-        lf.logging.LogEntry(
-            level=level,
-            time=datetime.datetime.now(),
-            message=message,
-            metadata=kwargs,
-        )
+  def _log(
+      self,
+      level: lf.logging.LogLevel,
+      message: str,
+      keep: bool,
+      **kwargs
+  ) -> None:
+    """Logs a message to the session."""
+    log_entry = lf.logging.log(
+        level, f'[{self.id}]: {message}]', **kwargs
     )
+    if keep:
+      self._current_execution.append(log_entry)
 
-  def debug(self, message: str, **kwargs):
+  def debug(self, message: str, keep: bool = True, **kwargs):
     """Logs a debug message to the session."""
-    self._log('debug', message, **kwargs)
+    self._log('debug', message, keep=keep, **kwargs)
 
-  def info(self, message: str, **kwargs):
+  def info(self, message: str, keep: bool = True, **kwargs):
     """Logs an info message to the session."""
-    self._log('info', message, **kwargs)
+    self._log('info', message, keep=keep, **kwargs)
 
-  def warning(self, message: str, **kwargs):
+  def warning(self, message: str, keep: bool = True, **kwargs):
     """Logs a warning message to the session."""
-    self._log('warning', message, **kwargs)
+    self._log('warning', message, keep=keep, **kwargs)
 
-  def error(self, message: str, **kwargs):
+  def error(self, message: str, keep: bool = True, **kwargs):
     """Logs an error message to the session."""
-    self._log('error', message, **kwargs)
+    self._log('error', message, keep=keep, **kwargs)
 
   def fatal(self, message: str, **kwargs):
     """Logs a fatal message to the session."""
-    self._log('fatal', message, **kwargs)
+    self._log('fatal', message, keep=True, **kwargs)
 
   def as_message(self) -> lf.AIMessage:
     """Returns the session as a message."""

langfun/core/agentic/action_test.py

@@ -65,10 +65,10 @@ class SessionTest(unittest.TestCase):
 
     lm = fake.StaticResponse('lm response')
     foo = Foo(1)
-    self.assertEqual(foo(lm=lm), 3)
+    self.assertEqual(foo(lm=lm, verbose=True), 3)
 
     session = foo.session
-    self.assertEqual(len(session.id), 7)
+    self.assertIn('session@', session.id)
     self.assertIsNotNone(session)
     self.assertIsInstance(session.root.action, action_lib.RootAction)
     self.assertIs(session.current_action, session.root)

langfun/core/logging.py

@@ -17,10 +17,10 @@ import contextlib
 import datetime
 import functools
 import typing
-from typing import Any, Iterator, Literal
+from typing import Any, Callable, Iterator, Literal
 
 from langfun.core import component
-from langfun.core import console
+from langfun.core import console as console_lib
 import pyglove as pg
 
 
@@ -43,6 +43,22 @@ def get_log_level() -> LogLevel:
   return component.context_value('__event_log_level__', 'info')
 
 
+def system_log_func(level: LogLevel) -> Callable[..., None]:
+  match level:
+    case 'debug':
+      return pg.logging.debug
+    case 'info':
+      return pg.logging.info
+    case 'warning':
+      return pg.logging.warning
+    case 'error':
+      return pg.logging.error
+    case 'fatal':
+      return pg.logging.error
+    case _:
+      raise ValueError(f'Unsupported log level: {level}')
+
+
 class LogEntry(pg.Object, pg.views.HtmlTreeView.Extension):
   """Event log entry."""
   time: datetime.datetime
@@ -241,6 +257,7 @@ def log(level: LogLevel,
         message: str,
         *,
         indent: int = 0,
+        console: bool = False,
         **kwargs) -> LogEntry:
   """Logs a message."""
   entry = LogEntry(
@@ -250,35 +267,71 @@ def log(level: LogLevel,
       message=message,
       metadata=kwargs,
   )
+
   if entry.should_output(get_log_level()):
-    if console.under_notebook():
-      console.display(entry)
-    else:
+    if console_lib.under_notebook():
+      console_lib.display(entry)
+    elif console:
       # TODO(daiyip): Improve the console output formatting.
-      console.write(entry)
+      console_lib.write(entry)
+
+  if not console:
+    if kwargs:
+      message = f'{message} (metadata: {pg.format(kwargs)})'
+    system_log_func(level)(message)
   return entry
 
 
-def debug(message: str, *, indent: int = 0, **kwargs) -> LogEntry:
+def debug(
+    message: str,
+    *,
+    indent: int = 0,
+    console: bool = False,
+    **kwargs
+) -> LogEntry:
   """Logs a debug message to the session."""
-  return log('debug', message, indent=indent, **kwargs)
+  return log('debug', message, indent=indent, console=console, **kwargs)
 
 
-def info(message: str, *, indent: int = 0, **kwargs) -> LogEntry:
+def info(
+    message: str,
+    *,
+    indent: int = 0,
+    console: bool = False,
+    **kwargs
+) -> LogEntry:
   """Logs an info message to the session."""
-  return log('info', message, indent=indent, **kwargs)
+  return log('info', message, indent=indent, console=console, **kwargs)
 
 
-def warning(message: str, *, indent: int = 0, **kwargs) -> LogEntry:
+def warning(
+    message: str,
+    *,
+    indent: int = 0,
+    console: bool = False,
+    **kwargs
+) -> LogEntry:
   """Logs an info message to the session."""
-  return log('warning', message, indent=indent, **kwargs)
+  return log('warning', message, indent=indent, console=console, **kwargs)
 
 
-def error(message: str, *, indent: int = 0, **kwargs) -> LogEntry:
+def error(
+    message: str,
+    *,
+    indent: int = 0,
+    console: bool = False,
+    **kwargs
+) -> LogEntry:
   """Logs an error message to the session."""
-  return log('error', message, indent=indent, **kwargs)
+  return log('error', message, indent=indent, console=console, **kwargs)
 
 
-def fatal(message: str, *, indent: int = 0, **kwargs) -> LogEntry:
+def fatal(
+    message: str,
+    *,
+    indent: int = 0,
+    console: bool = False,
+    **kwargs
+) -> LogEntry:
   """Logs a fatal message to the session."""
-  return log('fatal', message, indent=indent, **kwargs)
+  return log('fatal', message, indent=indent, console=console, **kwargs)

langfun/core/logging_test.py

@@ -13,8 +13,10 @@
 # limitations under the License.
 """Tests for langfun.core.logging."""
 
+import contextlib
 import datetime
 import inspect
+import io
 import unittest
 
 from langfun.core import logging
@@ -44,6 +46,13 @@ class LoggingTest(unittest.TestCase):
     self.assertEqual(logging.error('hi').level, 'error')
     self.assertEqual(logging.fatal('hi').level, 'fatal')
 
+  def test_log_without_system_logging(self):
+    with contextlib.redirect_stdout(io.StringIO()) as stdout:
+      logging.log('info', 'hi', indent=1, x=1, y=2, console=True)
+    self.assertIn(
+        'hi (metadata: {x=1, y=2})', stdout.getvalue()
+    )
+
   def test_repr_html(self):
     def assert_color(entry, color):
       self.assertIn(f'background-color: {color}', entry._repr_html_())

langfun/core/structured/querying.py

@@ -17,6 +17,7 @@ import contextlib
 import functools
 import time
 from typing import Annotated, Any, Callable, Iterator, Type, Union
+import uuid
 
 import langfun.core as lf
 from langfun.core.structured import mapping
@@ -118,6 +119,7 @@ def query(
     protocol: schema_lib.SchemaProtocol = 'python',
     returns_message: bool = False,
     skip_lm: bool = False,
+    invocation_id: str | None = None,
     **kwargs,
 ) -> Any:
   """Query one or more language models for structured or unstructured outputs.
@@ -263,6 +265,9 @@ def query(
       the final parsed result.
     skip_lm: If `True`, skips the LLM call and returns the rendered 
       prompt as a `UserMessage` object.
+    invocation_id: The ID of the query invocation, which will be passed to
+      `lf.QueryInvocation` when `lf.trackIf `None`, a unique ID will
+      be generated.
     **kwargs: Additional keyword arguments for:
       - Rendering templates (e.g., `template_str`, `preamble`),
       - Configuring `lf.structured.Mapping`.
@@ -275,11 +280,12 @@ def query(
   """
     # Internal usage logging.
 
+  invocation_id = invocation_id or f'query@{uuid.uuid4().hex[-7:]}'
   # Multiple quries will be issued when `lm` is a list or `num_samples` is
   # greater than 1.
   if isinstance(lm, list) or num_samples != 1:
     def _single_query(inputs):
-      lm, example_i = inputs
+      i, (lm, example_i) = inputs
       return query(
           prompt,
           schema,
@@ -298,6 +304,7 @@ def query(
           protocol=protocol,
           returns_message=returns_message,
           skip_lm=skip_lm,
+          invocation_id=f'{invocation_id}:{i}',
           **kwargs,
       )
     lm_list = lm if isinstance(lm, list) else [lm]
@@ -317,7 +324,8 @@ def query(
 
     samples = []
     for _, output, error in lf.concurrent_map(
-        _single_query, query_inputs, max_workers=max(64, total_queries),
+        _single_query, enumerate(query_inputs),
+        max_workers=max(64, total_queries),
         ordered=True,
     ):
       if error is None:
@@ -409,6 +417,7 @@ def query(
       metadata.pop('usage', None)
 
       invocation = QueryInvocation(
+          id=invocation_id,
           input=pg.Ref(query_input),
           schema=(
               schema_lib.Schema.from_value(schema)
@@ -565,6 +574,11 @@ def _reward_fn(cls) -> Callable[
 class QueryInvocation(pg.Object, pg.views.HtmlTreeView.Extension):
   """A class to represent the invocation of `lf.query`."""
 
+  id: Annotated[
+      str,
+      'The ID of the query invocation.'
+  ]
+
   input: Annotated[
       Union[lf.Template, pg.Symbolic],
       'Mapping input of `lf.query`.'

langfun/core/structured/querying_test.py

@@ -1076,8 +1076,9 @@ class QueryInvocationTest(unittest.TestCase):
         'Activity(description="hi"',
     ])
     with querying.track_queries() as queries:
-      querying.query('foo', Activity, default=None, lm=lm)
+      querying.query('foo', Activity, default=None, lm=lm, invocation_id='123')
 
+    self.assertEqual(queries[0].id, '123')
     self.assertTrue(queries[0].has_error)
     self.assertIsInstance(queries[0].output, mapping.MappingError)
 
@@ -1088,6 +1089,7 @@ class QueryInvocationTest(unittest.TestCase):
     with querying.track_queries() as queries:
       querying.query('foo', Activity, lm=lm)
 
+    self.assertIn('query@', queries[0].id)
     self.assertIn('schema', queries[0].to_html_str())
     self.assertEqual(queries[0].lm_response.score, 1.0)
     self.assertFalse(queries[0].lm_response.is_cached)

{langfun-0.1.2.dev202504250804.dist-info → langfun-0.1.2.dev202504260803.dist-info}/METADATA

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

{langfun-0.1.2.dev202504250804.dist-info → langfun-0.1.2.dev202504260803.dist-info}/RECORD

@@ -10,8 +10,8 @@ langfun/core/langfunc.py,sha256=G50YgoVZ0y1GFw2ev41MlOqr6qa8YakbvNC0h_E0PiA,1114
 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_test.py,sha256=iA5uo7rIj2jAtCYzMzhyNg1fWqE2Onn60bOO58q72C0,36454
-langfun/core/logging.py,sha256=W3mLEMXdo210Q5OX3a1ZTc4nU-xMy73-IfNKnsA-RFo,8051
-langfun/core/logging_test.py,sha256=N7-YvSXC8zvnr2SNwWHOykn1CFmqvIuTLDgn41Ku9JU,6642
+langfun/core/logging.py,sha256=ERTIE08dQ36K0qQ-6Vu-5uaEZIFWdHj9rVCXpEtc_7U,8959
+langfun/core/logging_test.py,sha256=vbVGOQxwMmVSiFfbt2897gUt-8nqDpV64jCAeUG_q5U,6924
 langfun/core/memory.py,sha256=f-asN1F7Vehgdn_fK84v73GrEUOxRtaW934keutTKjk,2416
 langfun/core/message.py,sha256=qUJZ9NfrlYG3aU_K2ud236gdTnvZ7Qw2T4pv4hI9ivg,32817
 langfun/core/message_test.py,sha256=XE7SaYJUK8TCJBdih4XtnpnB6NhcU-vLxJoaP67WbSU,40793
@@ -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=zm4R1D7NFi2YCMpUpc4gIR5_3Q1UgVfgYSGxhfxlvu0,33410
+langfun/core/agentic/action.py,sha256=zMFCyfG52pP_nDTZzJKw5BjMvREz4ER_wHLbhDzEA_g,33731
 langfun/core/agentic/action_eval.py,sha256=-ZcWt_eYqnTyOe9HFGyrLJkQRd4iG3hfN4IZ-NYAWwA,4534
 langfun/core/agentic/action_eval_test.py,sha256=tRUkWmOE9p0rpNOq19xAY2oDEnYsEEykjg6sUpAwJk0,2832
-langfun/core/agentic/action_test.py,sha256=HvNE175bjd5sH-Oz2rRenW9-7aw4DFTHPBn9zT6z4PA,5693
+langfun/core/agentic/action_test.py,sha256=ilirTICURoAR6LYjlg3oC3P1KSbLzJQDK4WaZONed2Q,5708
 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
@@ -137,8 +137,8 @@ langfun/core/structured/mapping.py,sha256=of-EeBq0RgmkiUaSk2rVEDVCzgn_wXU8tRke7N
 langfun/core/structured/mapping_test.py,sha256=OntYvfDitAf0tAnzQty3YS90vyEn6FY1Mi93r_ViEk8,9594
 langfun/core/structured/parsing.py,sha256=MGvI7ypXlwfzr5XB8_TFU9Ei0_5reYqkWkv64eAy0EA,12015
 langfun/core/structured/parsing_test.py,sha256=kNPrhpdPY3iWhUld0TFYU-Zgn44wC0d6YuQ9XdVbQ8o,22346
-langfun/core/structured/querying.py,sha256=DI6GbwgFMqHNtE9__jTtJJGJH6-ZNIWEgkoWgmYsWCk,24430
-langfun/core/structured/querying_test.py,sha256=5gNYus8Vf6lxMM7rxQGIUR_lzQw4MY7eikQgA5NNA4U,34156
+langfun/core/structured/querying.py,sha256=GGNtHtJcKh8rzLBNx_Df1ATvsPZzyfZuGkzSQVabdpo,24885
+langfun/core/structured/querying_test.py,sha256=vUuVUClYBFGEaO9KuD60huPE1dmP6RCRLeRnBv67NmQ,34263
 langfun/core/structured/schema.py,sha256=_iqhHEGDQsHk0AsybWnK44sOspTWkKJjci781PWD7x0,27988
 langfun/core/structured/schema_generation.py,sha256=3AcuKvv3VOtKY5zMVqODrxfOuDxzoZtGeBxHlOWDOWw,5308
 langfun/core/structured/schema_generation_test.py,sha256=RM9s71kMNg2jTePwInkiW9fK1ACN37eyPeF8OII-0zw,2950
@@ -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.dev202504250804.dist-info/licenses/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-langfun-0.1.2.dev202504250804.dist-info/METADATA,sha256=pb3hyM9a6nqaEvlFDUKBWKkZUWJue66LME5Zz26qVs0,7692
-langfun-0.1.2.dev202504250804.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
-langfun-0.1.2.dev202504250804.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
-langfun-0.1.2.dev202504250804.dist-info/RECORD,,
+langfun-0.1.2.dev202504260803.dist-info/licenses/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+langfun-0.1.2.dev202504260803.dist-info/METADATA,sha256=QUbCmM8v2vdPPyI7qvlJ47cvgUyQ5Z-gyRRbjLjJi8w,7692
+langfun-0.1.2.dev202504260803.dist-info/WHEEL,sha256=SmOxYU7pzNKBqASvQJ7DjX3XGUF92lrGhMb3R6_iiqI,91
+langfun-0.1.2.dev202504260803.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
+langfun-0.1.2.dev202504260803.dist-info/RECORD,,