langfun 0.1.2.dev202504260803__tar.gz → 0.1.2.dev202504280818__tar.gz

{langfun-0.1.2.dev202504260803 → langfun-0.1.2.dev202504280818}/PKG-INFO

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

{langfun-0.1.2.dev202504260803 → langfun-0.1.2.dev202504280818}/langfun/core/agentic/action.py

@@ -1132,3 +1132,14 @@ class Session(pg.Object, pg.views.html.HtmlTreeView.Extension):
         enable_key_tooltip=False,
     )
     return config
+
+
+# Register the logging functions to skip the source of the logging functions.
+pg.logging.register_frame_to_skip([
+    Session._log,   # pylint: disable=protected-access
+    Session.debug,
+    Session.info,
+    Session.warning,
+    Session.error,
+    Session.fatal
+])

{langfun-0.1.2.dev202504260803 → langfun-0.1.2.dev202504280818}/langfun/core/eval/v2/evaluation.py

@@ -316,7 +316,9 @@ class Evaluation(experiment_lib.Experiment):
 
   def _log(self, log_func, level: lf.logging.LogLevel, message: str, **kwargs):
     # Write to external logging system.
-    log_message = f'{self.id}: {message}'
+    log_message = message
+    if self.id not in log_message:
+      log_message = f'{self.id}: {log_message}'
     if kwargs:
       log_message = f'{log_message} (metadata: {kwargs!r})'
     log_func(log_message)
@@ -331,26 +333,6 @@ class Evaluation(experiment_lib.Experiment):
     with self._log_lock:
       self._log_entries.append(log_entry)
 
-    # Also add system log.
-    match level:
-      case 'debug':
-        sys_log_func = pg.logging.debug
-      case 'info':
-        sys_log_func = pg.logging.info
-      case 'warning':
-        sys_log_func = pg.logging.warning
-      case 'error':
-        sys_log_func = pg.logging.error
-      case 'fatal':
-        sys_log_func = pg.logging.error
-      case _:
-        raise ValueError(f'Unsupported log level: {level}')
-
-    sys_log_func(
-        '%s: %s\nMetadata: %s',
-        self.id, message, pg.format(kwargs)
-    )
-
   def debug(self, message: str, **kwargs):
     """Logs a debug message to the session."""
     self._log(pg.logging.debug, 'debug', message, **kwargs)
@@ -806,3 +788,13 @@ class EvaluationState:
             has_error=example.has_error,
         )
     )
+
+# Register the logging functions to skip the source of the logging functions.
+pg.logging.register_frame_to_skip([
+    Evaluation._log,    # pylint: disable=protected-access
+    Evaluation.debug,
+    Evaluation.info,
+    Evaluation.warning,
+    Evaluation.error,
+    Evaluation.fatal
+])

{langfun-0.1.2.dev202504260803 → langfun-0.1.2.dev202504280818}/langfun/core/logging.py

@@ -335,3 +335,7 @@ def fatal(
 ) -> LogEntry:
   """Logs a fatal message to the session."""
   return log('fatal', message, indent=indent, console=console, **kwargs)
+
+
+# Register the logging functions to skip the source of the logging functions.
+pg.logging.register_frame_to_skip([log, debug, info, warning, error, fatal])

{langfun-0.1.2.dev202504260803 → langfun-0.1.2.dev202504280818}/langfun/core/structured/schema.py

@@ -456,6 +456,11 @@ def class_definition(
         )
         continue
 
+      # Skip fields that are marked as excluded from the prompt sent to LLM
+      # for OOP.
+      if field.metadata.get('exclude_from_prompt', False):
+        continue
+
       # Write field doc string as comments before the field definition.
       if field.description:
         for line in field.description.split('\n'):
@@ -671,6 +676,7 @@ class ValuePythonRepr(ValueRepr):
            compact: bool = True,
            verbose: bool = False,
            markdown: bool = True,
+           assign_to_var: str | None = None,
            **kwargs) -> str:
     del schema
     if inspect.isclass(value):
@@ -694,6 +700,8 @@ class ValuePythonRepr(ValueRepr):
       object_code = pg.format(
           value, compact=compact, verbose=verbose, python_format=True
       )
+      if assign_to_var is not None:
+        object_code = f'{assign_to_var} = {object_code}'
     if markdown:
       return f'```python\n{ object_code }\n```'
     return object_code

{langfun-0.1.2.dev202504260803 → langfun-0.1.2.dev202504280818}/langfun/core/structured/schema_test.py

@@ -538,6 +538,19 @@ class SchemaPythonReprTest(unittest.TestCase):
             """) + '\n'
     )
 
+    class E(pg.Object):
+      x: str
+      y: typing.Annotated[int, 'y', dict(exclude_from_prompt=True)]
+
+    self.assertEqual(
+        schema_lib.class_definition(E),
+        inspect.cleandoc(
+            """
+            class E(Object):
+              x: str
+            """) + '\n'
+    )
+
   def test_repr(self):
     class Foo(pg.Object):
       x: int
@@ -704,6 +717,30 @@ class ValuePythonReprTest(unittest.TestCase):
         ),
         "A(foo=[Foo(x=1), Foo(x=2)], y='bar')",
     )
+    self.assertEqual(
+        schema_lib.ValuePythonRepr().repr(
+            A([Foo(1), Foo(2)], 'bar'),
+            schema_lib.Schema(A),
+            markdown=True,
+            compact=False,
+            assign_to_var='output',
+        ),
+        inspect.cleandoc("""
+            ```python
+            output = A(
+              foo=[
+                Foo(
+                  x=1
+                ),
+                Foo(
+                  x=2
+                )
+              ],
+              y='bar'
+            )
+            ```
+            """),
+    )
     self.assertEqual(
         schema_lib.ValuePythonRepr().repr(A),
         inspect.cleandoc("""

{langfun-0.1.2.dev202504260803 → langfun-0.1.2.dev202504280818}/langfun.egg-info/PKG-INFO

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