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

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/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/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/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/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.dist-info → langfun-0.1.2.dev202504280818.dist-info}/METADATA

@@ -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.dist-info → langfun-0.1.2.dev202504280818.dist-info}/RECORD

@@ -10,7 +10,7 @@ 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=ERTIE08dQ36K0qQ-6Vu-5uaEZIFWdHj9rVCXpEtc_7U,8959
+langfun/core/logging.py,sha256=ypjSwGzQpIhadewEKkIH5VWS55rfU4e6mlni41PMHlw,9116
 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
@@ -26,7 +26,7 @@ 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=zMFCyfG52pP_nDTZzJKw5BjMvREz4ER_wHLbhDzEA_g,33731
+langfun/core/agentic/action.py,sha256=83zH_cj0s9mxq7mnaTZXbB0Uf-y8d0ip5TrF-mabeT8,34000
 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=ilirTICURoAR6LYjlg3oC3P1KSbLzJQDK4WaZONed2Q,5708
@@ -63,7 +63,7 @@ langfun/core/eval/v2/__init__.py,sha256=9lNKJwbvl0lcFblAXYT_OHI8fOubJsTOdSkxEqsP
 langfun/core/eval/v2/checkpointing.py,sha256=t47rBfzGZYgIqWW1N1Ak9yQnNtHd-IRbEO0cZjG2VRo,11755
 langfun/core/eval/v2/checkpointing_test.py,sha256=NggOSJ_6XSa4cNP6nGIu9wLsK59dUwe8SPWDiXtGGDE,9197
 langfun/core/eval/v2/eval_test_helper.py,sha256=sKFi_wPYCNmr96WyTduuXY0KnxjFxcJyEhXey-_nGX8,3962
-langfun/core/eval/v2/evaluation.py,sha256=kdhou304i74LSjvCPuY4jeF7HpkQGZsKVFEhZCn1FUU,25105
+langfun/core/eval/v2/evaluation.py,sha256=07ebNx3bYlN25sg4Nam_QJRuikKVt9Pc0oXmSG6IS-k,24937
 langfun/core/eval/v2/evaluation_test.py,sha256=TKbeyeenoaUDH23E3TXXJ4otuq3VZBuWkWdV7c5vMk4,6804
 langfun/core/eval/v2/example.py,sha256=Jegt-viQSNYzPVkOZE_M19GON2TYGTct4Cp9HnJ7DGo,10861
 langfun/core/eval/v2/example_test.py,sha256=1DNm6EuyZOq827DKvf3oTRVFkMNM_qTnLUpvOjpgz5I,3419
@@ -139,10 +139,10 @@ langfun/core/structured/parsing.py,sha256=MGvI7ypXlwfzr5XB8_TFU9Ei0_5reYqkWkv64e
 langfun/core/structured/parsing_test.py,sha256=kNPrhpdPY3iWhUld0TFYU-Zgn44wC0d6YuQ9XdVbQ8o,22346
 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.py,sha256=pGiAjez-ON2nKLUSeAls27gJsMto5aJnCXLVwH3pUKM,28296
 langfun/core/structured/schema_generation.py,sha256=3AcuKvv3VOtKY5zMVqODrxfOuDxzoZtGeBxHlOWDOWw,5308
 langfun/core/structured/schema_generation_test.py,sha256=RM9s71kMNg2jTePwInkiW9fK1ACN37eyPeF8OII-0zw,2950
-langfun/core/structured/schema_test.py,sha256=ntgPzhoVhTRzT_QKn7ipXDIc6CZmz_zCpCzZnGKc_WQ,25193
+langfun/core/structured/schema_test.py,sha256=N8qNVA2hrHlxmHIoKtpzhBASa2RMVoPowF_noAfgPME,26035
 langfun/core/structured/scoring.py,sha256=Y7Jqs5VVjUQLF_9Z1uIY_dw5zasv2FF52Cz-cxGMsro,5857
 langfun/core/structured/scoring_test.py,sha256=QvlwDAzwuamKL5tCotm1L3Sx0cs3idoNK4aIEhaO4Yk,2272
 langfun/core/structured/tokenization.py,sha256=-b4_693quHeYn2AqndwucuXNmhd5NVXVTU3mmDane98,2189
@@ -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.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,,
+langfun-0.1.2.dev202504280818.dist-info/licenses/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+langfun-0.1.2.dev202504280818.dist-info/METADATA,sha256=plAMucug-VTFRA1dV85tEMMxAzexbS7Oro6dvINtLHA,7692
+langfun-0.1.2.dev202504280818.dist-info/WHEEL,sha256=ck4Vq1_RXyvS4Jt6SI0Vz6fyVs4GWg7AINwpsaGEgPE,91
+langfun-0.1.2.dev202504280818.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
+langfun-0.1.2.dev202504280818.dist-info/RECORD,,

{langfun-0.1.2.dev202504260803.dist-info → langfun-0.1.2.dev202504280818.dist-info}/WHEEL

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