langfun 0.1.2.dev202510070805__py3-none-any.whl → 0.1.2.dev202510090804__py3-none-any.whl

langfun/core/language_model.py

@@ -1462,7 +1462,7 @@ class _Metrics:
         'Number of calls to the language model.',
         parameters={'model': str, 'error': str},
     )
-    self.language_model_call_duration_ms = self._metrics.get_scalar(
+    self.language_model_call_duration_ms = self._metrics.get_distribution(
         'language_model_call_duration_ms',
         'Duration of calls to the language model in milliseconds.',
         parameters={'model': str, 'error': str},

langfun/core/structured/querying.py

@@ -446,6 +446,9 @@ def query(
     **kwargs: Additional keyword arguments for:
       - Rendering templates (e.g., `template_str`, `preamble`),
       - Configuring `lf.structured.Mapping`.
+      - metadata_xxx, which will be passed through to the rendered message
+        metadata under key `xxx`. This allows LLM behavior customization based
+        on metadata `xxx` from the prompt.
 
   Returns:
     The result of the query:

langfun/env/event_handlers/metric_writer.py

@@ -33,12 +33,12 @@ class MetricWriter(pg.Object, base.EventHandler):
       self,
       name: str,
       description: str,
-      parameters: dict[str, type[str]] | None = None
+      parameters: dict[str, type[str]] | None = None,
   ) -> pg.monitoring.Counter:
     return self._metric_collection.get_counter(
         name=name,
         description=description,
-        parameters=parameters
+        parameters=parameters,
     )
 
   def _get_scalar(
@@ -53,9 +53,21 @@ class MetricWriter(pg.Object, base.EventHandler):
         parameters=parameters
     )
 
+  def _get_distribution(
+      self,
+      name: str,
+      description: str,
+      parameters: dict[str, type[str]] | None = None
+  ) -> pg.monitoring.Metric:
+    return self._metric_collection.get_distribution(
+        name=name,
+        description=description,
+        parameters=parameters
+    )
+
   def _error_tag(self, error: BaseException | None) -> str:
     if error is None:
-      return ''
+      return 'Success'
     return pg.utils.ErrorInfo.from_exception(error).tag
 
   def _initialize_metrics(self) -> None:
@@ -67,7 +79,7 @@ class MetricWriter(pg.Object, base.EventHandler):
     # Environment metrics.
     #
 
-    self._environment_housekeep_duration_ms = self._get_scalar(
+    self._environment_housekeep_duration_ms = self._get_distribution(
         'environment_housekeep_duration_ms',
         description='Environment housekeeping duration in milliseconds',
         parameters={
@@ -100,6 +112,15 @@ class MetricWriter(pg.Object, base.EventHandler):
             'error': str
         }
     )
+    self._sandbox_count = self._get_scalar(
+        'sandbox_count',
+        description='Sandbox count',
+        parameters={
+            'app': str,
+            'environment_id': str,
+            'status': str,
+        },
+    )
     self._sandbox_housekeep = self._get_counter(
         'sandbox_housekeep',
         description='Sandbox housekeeping counter',
@@ -121,7 +142,7 @@ class MetricWriter(pg.Object, base.EventHandler):
     )
 
     # Sandbox scalars.
-    self._sandbox_lifetime_ms = self._get_scalar(
+    self._sandbox_lifetime_ms = self._get_distribution(
         'sandbox_lifetime_ms',
         description='Sandbox life time in milliseconds',
         parameters={
@@ -130,7 +151,7 @@ class MetricWriter(pg.Object, base.EventHandler):
             'error': str,
         }
     )
-    self._sandbox_start_duration_ms = self._get_scalar(
+    self._sandbox_start_duration_ms = self._get_distribution(
         'sandbox_start_duration_ms',
         description='Sandbox start duration in milliseconds',
         parameters={
@@ -139,7 +160,7 @@ class MetricWriter(pg.Object, base.EventHandler):
             'error': str,
         }
     )
-    self._sandbox_shutdown_duration_ms = self._get_scalar(
+    self._sandbox_shutdown_duration_ms = self._get_distribution(
         'sandbox_shutdown_duration_ms',
         description='Sandbox shutdown duration in milliseconds',
         parameters={
@@ -148,7 +169,7 @@ class MetricWriter(pg.Object, base.EventHandler):
             'error': str,
         }
     )
-    self._sandbox_housekeep_duration_ms = self._get_scalar(
+    self._sandbox_housekeep_duration_ms = self._get_distribution(
         'sandbox_housekeep_duration_ms',
         description='Sandbox housekeeping duration in milliseconds',
         parameters={
@@ -157,7 +178,7 @@ class MetricWriter(pg.Object, base.EventHandler):
             'error': str,
         }
     )
-    self._sandbox_status_duration_ms = self._get_scalar(
+    self._sandbox_status_duration_ms = self._get_distribution(
         'sandbox_status_duration_ms',
         description='Sandbox duration of specific status in milliseconds',
         parameters={
@@ -166,7 +187,7 @@ class MetricWriter(pg.Object, base.EventHandler):
             'status': str,
         }
     )
-    self._sandbox_activity_duration_ms = self._get_scalar(
+    self._sandbox_activity_duration_ms = self._get_distribution(
         'sandbox_activity_duration_ms',
         description='Sandbox activity duration in milliseconds',
         parameters={
@@ -234,7 +255,7 @@ class MetricWriter(pg.Object, base.EventHandler):
     )
 
     # Feature scalars.
-    self._feature_setup_duration_ms = self._get_scalar(
+    self._feature_setup_duration_ms = self._get_distribution(
         'feature_setup_duration_ms',
         description='Feature setup duration in milliseconds',
         parameters={
@@ -244,7 +265,7 @@ class MetricWriter(pg.Object, base.EventHandler):
             'error': str,
         }
     )
-    self._feature_teardown_duration_ms = self._get_scalar(
+    self._feature_teardown_duration_ms = self._get_distribution(
         'feature_teardown_duration_ms',
         description='Feature teardown duration in milliseconds',
         parameters={
@@ -254,7 +275,7 @@ class MetricWriter(pg.Object, base.EventHandler):
             'error': str,
         }
     )
-    self._feature_setup_session_duration_ms = self._get_scalar(
+    self._feature_setup_session_duration_ms = self._get_distribution(
         'feature_setup_session_duration_ms',
         description='Feature setup session duration in milliseconds',
         parameters={
@@ -264,7 +285,7 @@ class MetricWriter(pg.Object, base.EventHandler):
             'error': str,
         }
     )
-    self._feature_teardown_session_duration_ms = self._get_scalar(
+    self._feature_teardown_session_duration_ms = self._get_distribution(
         'feature_teardown_session_duration_ms',
         description='Feature teardown session duration in milliseconds',
         parameters={
@@ -274,7 +295,7 @@ class MetricWriter(pg.Object, base.EventHandler):
             'error': str,
         }
     )
-    self._feature_housekeep_duration_ms = self._get_scalar(
+    self._feature_housekeep_duration_ms = self._get_distribution(
         'feature_housekeep_duration_ms',
         description='Feature housekeeping duration in milliseconds',
         parameters={
@@ -289,7 +310,7 @@ class MetricWriter(pg.Object, base.EventHandler):
     # Session metrics.
     #
 
-    self._session_start_duration_ms = self._get_scalar(
+    self._session_start_duration_ms = self._get_distribution(
         'session_start_duration_ms',
         description='Session start duration in milliseconds',
         parameters={
@@ -298,7 +319,7 @@ class MetricWriter(pg.Object, base.EventHandler):
             'error': str,
         }
     )
-    self._session_end_duration_ms = self._get_scalar(
+    self._session_end_duration_ms = self._get_distribution(
         'session_end_duration_ms',
         description='Session end duration in milliseconds',
         parameters={
@@ -307,7 +328,7 @@ class MetricWriter(pg.Object, base.EventHandler):
             'error': str,
         }
     )
-    self._session_lifetime_ms = self._get_scalar(
+    self._session_lifetime_ms = self._get_distribution(
         'session_lifetime_ms',
         description='Session lifetime in milliseconds',
         parameters={
@@ -373,6 +394,19 @@ class MetricWriter(pg.Object, base.EventHandler):
         environment_id=str(environment.id),
         status=old_status.value
     )
+    if old_status != base.Sandbox.Status.CREATED:
+      self._sandbox_count.increment(
+          delta=-1,
+          app=self.app,
+          environment_id=str(environment.id),
+          status=old_status.value
+      )
+    if new_status != base.Sandbox.Status.OFFLINE:
+      self._sandbox_count.increment(
+          app=self.app,
+          environment_id=str(environment.id),
+          status=new_status.value
+      )
 
   def on_sandbox_shutdown(
       self,

langfun/env/event_handlers/metric_writer_test.py

@@ -47,7 +47,7 @@ class MetricWriterTest(unittest.TestCase):
         writer._sandbox_start.value(
             app='test_app',
             environment_id='testing-env',
-            error=''
+            error='Success'
         ),
         2
     )
@@ -55,7 +55,7 @@ class MetricWriterTest(unittest.TestCase):
         writer._sandbox_housekeep.value(
             app='test_app',
             environment_id='testing-env',
-            error=''
+            error='Success'
         ),
         0,
     )
@@ -63,15 +63,32 @@ class MetricWriterTest(unittest.TestCase):
         writer._sandbox_shutdown.value(
             app='test_app',
             environment_id='testing-env',
-            error=''
+            error='Success'
         ),
         2
     )
+    self.assertEqual(
+        writer._sandbox_count.value(
+            app='test_app',
+            environment_id='testing-env',
+            status='ready',
+        ),
+        0
+    )
+    self.assertEqual(
+        writer._sandbox_count.value(
+            app='test_app',
+            environment_id='testing-env',
+            status='offline',
+        ),
+        0
+    )
     self.assertEqual(
         writer._feature_setup.value(
             app='test_app',
             environment_id='testing-env',
-            feature_name='test_feature1', error=''
+            feature_name='test_feature1',
+            error='Success'
         ),
         2,
     )
@@ -79,7 +96,8 @@ class MetricWriterTest(unittest.TestCase):
         writer._feature_setup.value(
             app='test_app',
             environment_id='testing-env',
-            feature_name='test_feature2', error=''
+            feature_name='test_feature2',
+            error='Success'
         ),
         2,
     )
@@ -87,7 +105,8 @@ class MetricWriterTest(unittest.TestCase):
         writer._feature_setup_session.value(
             app='test_app',
             environment_id='testing-env',
-            feature_name='test_feature1', error=''
+            feature_name='test_feature1',
+            error='Success'
         ),
         3,
     )
@@ -95,7 +114,8 @@ class MetricWriterTest(unittest.TestCase):
         writer._feature_setup_session.value(
             app='test_app',
             environment_id='testing-env',
-            feature_name='test_feature2', error=''
+            feature_name='test_feature2',
+            error='Success'
         ),
         3,
     )
@@ -103,7 +123,8 @@ class MetricWriterTest(unittest.TestCase):
         writer._feature_teardown_session.value(
             app='test_app',
             environment_id='testing-env',
-            feature_name='test_feature1', error=''
+            feature_name='test_feature1',
+            error='Success'
         ),
         2,
     )
@@ -111,7 +132,8 @@ class MetricWriterTest(unittest.TestCase):
         writer._feature_teardown_session.value(
             app='test_app',
             environment_id='testing-env',
-            feature_name='test_feature2', error=''
+            feature_name='test_feature2',
+            error='Success'
         ),
         2,
     )
@@ -119,7 +141,8 @@ class MetricWriterTest(unittest.TestCase):
         writer._feature_teardown.value(
             app='test_app',
             environment_id='testing-env',
-            feature_name='test_feature1', error=''
+            feature_name='test_feature1',
+            error='Success'
         ),
         2,
     )
@@ -127,7 +150,8 @@ class MetricWriterTest(unittest.TestCase):
         writer._feature_teardown.value(
             app='test_app',
             environment_id='testing-env',
-            feature_name='test_feature2', error=''
+            feature_name='test_feature2',
+            error='Success'
         ),
         2,
     )
@@ -135,7 +159,8 @@ class MetricWriterTest(unittest.TestCase):
         writer._feature_housekeep.value(
             app='test_app',
             environment_id='testing-env',
-            feature_name='test_feature1', error=''
+            feature_name='test_feature1',
+            error='Success'
         ),
         0,
     )
@@ -143,7 +168,8 @@ class MetricWriterTest(unittest.TestCase):
         writer._feature_housekeep.value(
             app='test_app',
             environment_id='testing-env',
-            feature_name='test_feature2', error=''
+            feature_name='test_feature2',
+            error='Success'
         ),
         0,
     )
@@ -151,7 +177,8 @@ class MetricWriterTest(unittest.TestCase):
         writer._sandbox_activity.value(
             app='test_app',
             environment_id='testing-env',
-            activity='shell', error=''
+            activity='shell',
+            error='Success'
         ),
         18
     )

{langfun-0.1.2.dev202510070805.dist-info → langfun-0.1.2.dev202510090804.dist-info}/METADATA

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

{langfun-0.1.2.dev202510070805.dist-info → langfun-0.1.2.dev202510090804.dist-info}/RECORD

@@ -17,7 +17,7 @@ langfun/core/console.py,sha256=cLQEf84aDxItA9fStJV22xJch0TqFLNf9hLqwJ0RHmU,2652
 langfun/core/console_test.py,sha256=pBOcuNMJdVELywvroptfcRtJMsegMm3wSlHAL2TdxVk,1679
 langfun/core/langfunc.py,sha256=G50YgoVZ0y1GFw2ev41MlOqr6qa8YakbvNC0h_E0PiA,11140
 langfun/core/langfunc_test.py,sha256=CDn-gJCa5EnjN7cotAVCfSCbuzddq2o-HzEt7kV8HbY,8882
-langfun/core/language_model.py,sha256=Fs7sKLji8SZFn2V1pMpSyZREaobvlWQygCbZnJBVgcY,52101
+langfun/core/language_model.py,sha256=xrSaO7KLBRf0rEjnFHBH9fZ0oGfmWhlA0ezAlWEMnTc,52107
 langfun/core/language_model_test.py,sha256=aJWn3UJm_S6U7VhU7EVXdJHPe1xza5glngPkRGtx280,38426
 langfun/core/logging.py,sha256=7IGAhp7mGokZxxqtL-XZvFLKaZ5k3F5_Xp2NUtR4GwE,9136
 langfun/core/logging_test.py,sha256=vbVGOQxwMmVSiFfbt2897gUt-8nqDpV64jCAeUG_q5U,6924
@@ -146,7 +146,7 @@ langfun/core/structured/mapping.py,sha256=1YBW8PKpJKXS7DKukfzKNioL84PrKUcB4KOUud
 langfun/core/structured/mapping_test.py,sha256=OntYvfDitAf0tAnzQty3YS90vyEn6FY1Mi93r_ViEk8,9594
 langfun/core/structured/parsing.py,sha256=bLi7o1AdyDWc6TwxmYg70t_oTgmLkJWBafakdF8n2RI,14195
 langfun/core/structured/parsing_test.py,sha256=vRfCSzA9q7C1cElkAnDvbRepULEa_vclqDIv-heypDw,22745
-langfun/core/structured/querying.py,sha256=DKp3HCJRetbfC2hnrb680aQBr2AIkXoVA9pd8r6nuPI,39452
+langfun/core/structured/querying.py,sha256=Ev7DAc790nCOGbiQ6yz4caiSf0RQR1UTdwKIKEJJUMQ,39649
 langfun/core/structured/querying_test.py,sha256=iDaqDJCJpdILj2b6I7fTLmbYzAU4EFjQacTRDxx2b0g,50353
 langfun/core/structured/schema.py,sha256=xtgrr3t5tcYQ2gi_fkTKz2IgDMf84gpiykmBdfnV6Io,29486
 langfun/core/structured/schema_generation.py,sha256=pEWeTd8tQWYnEHukas6GVl4uGerLsQ2aNybtnm4Qgxc,5352
@@ -179,10 +179,10 @@ langfun/env/event_handlers/__init__.py,sha256=H34n-TbKSgtxqBhE-yAti8fY6weF2_v3yw
 langfun/env/event_handlers/base.py,sha256=eGdJ6N5em9kX-c9wzm1TdnRP5_5IAltX5JTHILdjzLM,10124
 langfun/env/event_handlers/event_logger.py,sha256=3dbPjBe53dBgntYHlyLlj_77hVecPSXkmKeiGXMxlO0,12699
 langfun/env/event_handlers/event_logger_test.py,sha256=PGof3rPllNnyzs3Yp8kaOHLeTkVrzUgCJwlODTrVRKI,9111
-langfun/env/event_handlers/metric_writer.py,sha256=cnJe0BeWntUZ56NlwB8lkv2udcldds9GNyMg71Zz-II,16994
-langfun/env/event_handlers/metric_writer_test.py,sha256=4tI7s3o1Gw1bawXewaEZ65EPPOcr8A4m1bLK7uUcJY4,4735
-langfun-0.1.2.dev202510070805.dist-info/licenses/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-langfun-0.1.2.dev202510070805.dist-info/METADATA,sha256=yAexTugtlh0I2DtDp-ziy5TGQi0e45C9DhmiJOhVq-w,7380
-langfun-0.1.2.dev202510070805.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-langfun-0.1.2.dev202510070805.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
-langfun-0.1.2.dev202510070805.dist-info/RECORD,,
+langfun/env/event_handlers/metric_writer.py,sha256=NgJKsd6xWOtEd0IjYi7coGEaqGYkkPcDjXN9CQ3vxPU,18043
+langfun/env/event_handlers/metric_writer_test.py,sha256=flRqK10wonhJk4idGD_8jjEjrfjgH0R-qcu-7Bj1G5s,5335
+langfun-0.1.2.dev202510090804.dist-info/licenses/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+langfun-0.1.2.dev202510090804.dist-info/METADATA,sha256=rmnTEsTUBmHyBaoSOzWAxwbLfVSYYpwMgsRifkQjBSA,7380
+langfun-0.1.2.dev202510090804.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+langfun-0.1.2.dev202510090804.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
+langfun-0.1.2.dev202510090804.dist-info/RECORD,,