langfun 0.1.2.dev202511010804__py3-none-any.whl → 0.1.2.dev202511030805__py3-none-any.whl

langfun/env/interface_test.py

@@ -41,6 +41,35 @@ class IdTest(unittest.TestCase):
     )
     self.assertIsNone(sandbox_id.working_dir(root_dir=None))
 
+  def test_feature_id(self):
+    # For non-sandboxed feature.
+    feature_id = interface.Feature.Id(
+        container_id=interface.Environment.Id('env'),
+        feature_name='feature'
+    )
+    self.assertEqual(str(feature_id), 'env/feature')
+    self.assertEqual(
+        feature_id.working_dir(root_dir='/tmp'),
+        '/tmp/env/feature'
+    )
+    self.assertIsNone(feature_id.working_dir(root_dir=None))
+
+    # For sandboxed feature.
+    feature_id = interface.Feature.Id(
+        container_id=interface.Sandbox.Id(
+            environment_id=interface.Environment.Id('env'),
+            image_id='image1',
+            sandbox_id='0'
+        ),
+        feature_name='feature'
+    )
+    self.assertEqual(str(feature_id), 'env/image1:0/feature')
+    self.assertEqual(
+        feature_id.working_dir(root_dir='/tmp'),
+        '/tmp/env/image1/0/feature'
+    )
+    self.assertIsNone(feature_id.working_dir(root_dir=None))
+
 
 class TestingSandbox(interface.Sandbox):
 
@@ -109,7 +138,7 @@ class DecoratorTest(unittest.TestCase):
 
     class SandboxB(TestingSandbox):
 
-      @interface.log_sandbox_activity()
+      @interface.log_activity()
       def bar(self, x: str) -> None:
         pass
 

langfun/env/test_utils.py

@@ -112,7 +112,7 @@ class TestingSandbox(base_sandbox.BaseSandbox):
     super()._shutdown()
 
   @interface.treat_as_sandbox_state_error(errors=(RuntimeError,))
-  @interface.log_sandbox_activity()
+  @interface.log_activity()
   def shell(
       self,
       code: str,
@@ -184,19 +184,19 @@ class TestingFeature(base_feature.BaseFeature):
     if self.call_end_session_on_teardown_session:
       self.sandbox.end_session()
 
-  @interface.log_sandbox_activity()
+  @interface.log_activity()
   def num_shell_calls(self) -> int:
     return len(self.sandbox._shell_history)  # pylint: disable=protected-access
 
-  @interface.log_sandbox_activity()
+  @interface.log_activity()
   def bad_shell_call(self) -> None:
     self.sandbox.shell('bad command', raise_error=RuntimeError)
 
-  @interface.log_sandbox_activity()
+  @interface.log_activity()
   def show_session_id(self):
     return self.session_id
 
-  @interface.log_sandbox_activity()
+  @interface.log_activity()
   def call_with_varargs(self, code: str, *args, **kwargs):
     del code, args, kwargs
     return 0
@@ -220,6 +220,43 @@ class TestingFeature(base_feature.BaseFeature):
       )
 
 
+class TestingNonSandboxBasedFeature(base_feature.BaseFeature):
+  """Testing non-sandbox based feature for unit tests."""
+  is_sandbox_based: bool = False
+  simulate_setup_error: Type[BaseException] | None = None
+  simulate_teardown_error: Type[BaseException] | None = None
+  simulate_setup_session_error: Type[BaseException] | None = None
+  simulate_teardown_session_error: Type[BaseException] | None = None
+  simulate_housekeep_error: Type[BaseException] | None = None
+
+  def _setup(self) -> None:
+    if self.simulate_setup_error:
+      raise self.simulate_setup_error('Feature setup error')
+
+  def _teardown(self) -> None:
+    if self.simulate_teardown_error:
+      raise self.simulate_teardown_error('Feature teardown error')
+
+  def _setup_session(self) -> None:
+    if self.simulate_setup_session_error:
+      raise self.simulate_setup_session_error('Feature session setup error')
+
+  def _teardown_session(self) -> None:
+    if self.simulate_teardown_session_error:
+      raise self.simulate_teardown_session_error(
+          'Feature session teardown error'
+      )
+
+  def _housekeep(self) -> None:
+    if self.simulate_housekeep_error:
+      raise self.simulate_housekeep_error('Feature housekeeping error')
+    _ = self.foo(1)
+
+  @interface.log_activity()
+  def foo(self, x: int) -> int:
+    return x + 1
+
+
 class TestingEventHandler(pg.Object, interface.EventHandler):
   """Testing environment event handler for unit tests."""
 
@@ -281,7 +318,6 @@ class TestingEventHandler(pg.Object, interface.EventHandler):
 
   def on_sandbox_start(
       self,
-      environment: interface.Environment,
       sandbox: interface.Sandbox,
       duration: float,
       error: BaseException | None
@@ -291,7 +327,6 @@ class TestingEventHandler(pg.Object, interface.EventHandler):
 
   def on_sandbox_status_change(
       self,
-      environment: interface.Environment,
       sandbox: interface.Sandbox,
       old_status: interface.Sandbox.Status,
       new_status: interface.Sandbox.Status,
@@ -306,7 +341,6 @@ class TestingEventHandler(pg.Object, interface.EventHandler):
 
   def on_sandbox_shutdown(
       self,
-      environment: interface.Environment,
       sandbox: interface.Sandbox,
       duration: float,
       lifetime: float,
@@ -315,9 +349,53 @@ class TestingEventHandler(pg.Object, interface.EventHandler):
     assert duration > 0 and lifetime is not None
     self._add_message(f'[{sandbox.id}] sandbox shutdown', error)
 
+  def on_sandbox_session_start(
+      self,
+      sandbox: interface.Sandbox,
+      session_id: str,
+      duration: float,
+      error: BaseException | None
+  ) -> None:
+    """Called when a sandbox session starts."""
+    assert duration > 0
+    self._add_message(
+        f'[{sandbox.id}] session {session_id!r} started', error
+    )
+
+  def on_sandbox_session_end(
+      self,
+      sandbox: interface.Sandbox,
+      session_id: str,
+      duration: float,
+      lifetime: float,
+      error: BaseException | None
+  ) -> None:
+    """Called when a sandbox session ends."""
+    assert duration > 0 and lifetime > 0
+    self._add_message(
+        f'[{sandbox.id}] session {session_id!r} ended', error
+    )
+
+  def on_sandbox_activity(
+      self,
+      name: str,
+      sandbox: interface.Sandbox,
+      session_id: str | None,
+      duration: float,
+      error: BaseException | None,
+      *,
+      code: str | None = None,
+      **kwargs
+  ) -> None:
+    """Called when a sandbox activity is performed."""
+    del kwargs
+    log_id = f'{sandbox.id}@{session_id or "<idle>"}'
+    self._add_message(
+        f'[{log_id}] {name}: {code}', error
+    )
+
   def on_sandbox_housekeep(
       self,
-      environment: interface.Environment,
       sandbox: interface.Sandbox,
       counter: int,
       duration: float,
@@ -332,8 +410,6 @@ class TestingEventHandler(pg.Object, interface.EventHandler):
 
   def on_feature_setup(
       self,
-      environment: interface.Environment,
-      sandbox: interface.Sandbox,
       feature: interface.Feature,
       duration: float,
       error: BaseException | None
@@ -342,13 +418,11 @@ class TestingEventHandler(pg.Object, interface.EventHandler):
     assert duration > 0
     if self.log_feature_setup:
       self._add_message(
-          f'[{sandbox.id}/{feature.name}] feature setup', error
+          f'[{feature.id}] feature setup', error
       )
 
   def on_feature_teardown(
       self,
-      environment: interface.Environment,
-      sandbox: interface.Sandbox,
       feature: interface.Feature,
       duration: float,
       error: BaseException | None
@@ -357,13 +431,11 @@ class TestingEventHandler(pg.Object, interface.EventHandler):
     assert duration > 0
     if self.log_feature_setup:
       self._add_message(
-          f'[{sandbox.id}/{feature.name}] feature teardown', error
+          f'[{feature.id}] feature teardown', error
       )
 
   def on_feature_setup_session(
       self,
-      environment: interface.Environment,
-      sandbox: interface.Sandbox,
       feature: interface.Feature,
       session_id: str | None,
       duration: float,
@@ -373,13 +445,12 @@ class TestingEventHandler(pg.Object, interface.EventHandler):
     assert duration > 0
     if self.log_session_setup:
       self._add_message(
-          f'[{sandbox.id}/{feature.name}] feature setup session', error
+          f'[{feature.id}@{session_id or "<idle>"}] feature setup session',
+          error
       )
 
   def on_feature_teardown_session(
       self,
-      environment: interface.Environment,
-      sandbox: interface.Sandbox,
       feature: interface.Feature,
       session_id: str,
       duration: float,
@@ -389,77 +460,38 @@ class TestingEventHandler(pg.Object, interface.EventHandler):
     assert duration > 0
     if self.log_session_setup:
       self._add_message(
-          f'[{sandbox.id}/{feature.name}] feature teardown session', error
+          f'[{feature.id}@{session_id}] feature teardown session', error
       )
 
-  def on_feature_housekeep(
+  def on_feature_activity(
       self,
-      environment: interface.Environment,
-      sandbox: interface.Sandbox,
+      name: str,
       feature: interface.Feature,
-      counter: int,
+      session_id: str | None,
       duration: float,
       error: BaseException | None,
+      *,
+      code: str | None = None,
       **kwargs
   ) -> None:
-    """Called when a sandbox feature is housekeeping."""
-    assert duration > 0
-    if self.log_housekeep:
-      self._add_message(
-          f'[{sandbox.id}/{feature.name}] feature housekeeping {counter}', error
-      )
-
-  def on_session_start(
-      self,
-      environment: interface.Environment,
-      sandbox: interface.Sandbox,
-      session_id: str,
-      duration: float,
-      error: BaseException | None
-  ) -> None:
-    """Called when a sandbox session starts."""
-    assert duration > 0
-    self._add_message(
-        f'[{sandbox.id}] session {session_id!r} started', error
-    )
-
-  def on_session_end(
-      self,
-      environment: interface.Environment,
-      sandbox: interface.Sandbox,
-      session_id: str,
-      duration: float,
-      lifetime: float,
-      error: BaseException | None
-  ) -> None:
-    """Called when a sandbox session ends."""
-    assert duration > 0 and lifetime > 0
+    """Called when a sandbox activity is performed."""
+    del kwargs
+    log_id = f'{feature.id}@{session_id or "<idle>"}'
     self._add_message(
-        f'[{sandbox.id}] session {session_id!r} ended', error
+        f'[{log_id}] {name}: {code}', error
     )
 
-  def on_sandbox_activity(
+  def on_feature_housekeep(
       self,
-      name: str,
-      environment: interface.Environment,
-      sandbox: interface.Sandbox,
-      feature: interface.Feature | None,
-      session_id: str | None,
+      feature: interface.Feature,
+      counter: int,
       duration: float,
       error: BaseException | None,
-      *,
-      code: str | None = None,
       **kwargs
   ) -> None:
-    """Called when a sandbox activity is performed."""
-    del environment, kwargs
-    if session_id is None:
-      log_id = sandbox.id
-    else:
-      log_id = f'{sandbox.id}/{session_id}'
-
-    if feature is not None:
-      log_id = f'{log_id}/{feature.name}'
-    self._add_message(
-        f'[{log_id}] {name}: {code}', error
-    )
+    """Called when a sandbox feature is housekeeping."""
+    assert duration > 0
+    if self.log_housekeep:
+      self._add_message(
+          f'[{feature.id}] feature housekeeping {counter}', error
+      )

{langfun-0.1.2.dev202511010804.dist-info → langfun-0.1.2.dev202511030805.dist-info}/METADATA

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

{langfun-0.1.2.dev202511010804.dist-info → langfun-0.1.2.dev202511030805.dist-info}/RECORD

@@ -89,7 +89,7 @@ langfun/core/eval/v2/progress_tracking_test.py,sha256=omOvSTvF-KgzwmXiOUj8sr5Dha
 langfun/core/eval/v2/reporting.py,sha256=yUIPCAMnp7InIzpv1DDWrcLO-75iiOUTpscj7smkfrA,8335
 langfun/core/eval/v2/reporting_test.py,sha256=CMK-vwho8cNRJwlbkCqm_v5fykE7Y3V6SaIOCY0CDyA,5671
 langfun/core/eval/v2/runners.py,sha256=bEniZDNu44AQgvqpwLsvBU4V_7WltAe-NPhYgIsLj1E,16848
-langfun/core/eval/v2/runners_test.py,sha256=spjkmqlls_vyERdZMdjv6dhIN9ZfxsDDvIQAWTj2kMk,11954
+langfun/core/eval/v2/runners_test.py,sha256=Fw_OGaJZbMSwxBMRZ_PnCu4vPIlIfmzUYA9U2hq3FwQ,11996
 langfun/core/llms/__init__.py,sha256=UJ1UE41JPgkS56uNzJQ5ag9VWJN3OJuNna7aFR4CyOM,10184
 langfun/core/llms/anthropic.py,sha256=O_OuBiFhHou1Y15W2GwYFY1gV3FUsSUBOsAJp9UORqI,30710
 langfun/core/llms/anthropic_test.py,sha256=qA9vByp_cwwXNlXzcwHpPWFnO9lfFo8NKfDi5nBNqgI,9052
@@ -174,26 +174,27 @@ 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/env/__init__.py,sha256=EOKAU4CrlUAQtGORBaXXP1q_fAS6NHd6rIMOnRwWrjg,1688
-langfun/env/base_environment.py,sha256=vU0IL6-Fmx7xAYeefRLPSjMfwuhCz5b23h5T1HeILTk,24742
-langfun/env/base_environment_test.py,sha256=zXaCMA6JrWFtit68SESx_jGWzO6h7NQZpux4FqCMueQ,15432
-langfun/env/base_feature.py,sha256=5vC-zXYRaImh_nAc0mkgV9vW4ObKYarLUepQeCVAEMw,8189
-langfun/env/base_sandbox.py,sha256=-TZZ4JeQ5PaH0qhfF_HxPPosAHAJLfyD7rGETrbyYhQ,28015
-langfun/env/base_sandbox_test.py,sha256=zs3HL90dyp2YybEhS7splyQNmODSO8J1B8BT8KUBlAY,59450
-langfun/env/interface.py,sha256=zjmrXJcN2cV7a-Ja3V1b-JdpKA11ajWQqk46obHxfsI,41656
-langfun/env/interface_test.py,sha256=d8vdXL1PkrNQGwzfEI2r6esd6SBnTMgc-3GNArsnuj4,3295
+langfun/env/__init__.py,sha256=Iwl5JQk6bGuScJcjx8NqKUCaZw1r8oRiuqFadu8x_Ss,1680
+langfun/env/base_environment.py,sha256=CEDi4BXxfsGbkRZam2ywP0scpb-rbRb6bdMTFhNitB4,27013
+langfun/env/base_environment_test.py,sha256=JltE2uPrruCpj0V50T3NGG3cf_8WDss67dEMk-REPRA,15457
+langfun/env/base_feature.py,sha256=ohotob1Cnjd9M1BzHUS2ezGZgifcvXs6Ce0bOTGTkf8,8473
+langfun/env/base_feature_test.py,sha256=n1IrU6tHRwHjkyD7yHJtfAQ8yrSSAteVdIqfTK49JI8,7094
+langfun/env/base_sandbox.py,sha256=hTomEzky4Jfunt2Kse7uaboBYCCGAUf_xTY9kcPZDcY,27942
+langfun/env/base_sandbox_test.py,sha256=j1WugtZBjvI9zo2_1tvuBhORMFENp8TanQwGfXwEUKE,60308
+langfun/env/interface.py,sha256=tZGJ1RLmcsctz62pyBdravibUQL439Lkc4O40l7FtzY,51760
+langfun/env/interface_test.py,sha256=AOosmhIIi4HVQ_WFmWha05oyj3-md4eJ4ODMTR6oJVw,4212
 langfun/env/load_balancers.py,sha256=qRhCthqzjZIQBwta8qC1C0s0J-VQAVomJQqI7Nqv-r4,1948
 langfun/env/load_balancers_test.py,sha256=Bg0h-AL7LpWb_aixFXs_FpgQp4dWLvodcsQj-mys6zs,4125
-langfun/env/test_utils.py,sha256=i6OadjYfLl5IBrDhEzWiJWsq_GWlplHnrBDD0LEB_HM,14090
+langfun/env/test_utils.py,sha256=07Nszmqo3Xf5O5d_O2Qp7OcTB_wJ7QG53t6TqMgAchc,14946
 langfun/env/event_handlers/__init__.py,sha256=EE3pV0BlhvYfTG3njhVTMqj88IO_gwjLqZDGSGL95DE,449
-langfun/env/event_handlers/chain.py,sha256=elOAeY38rL0PzNKBq-jwsEqb6ZLE0aOI0LkRSQlQofs,7608
-langfun/env/event_handlers/chain_test.py,sha256=FI0hnDdzmyPe6nEJDeVDrczM49SL9Mhch3STCtgNp7w,8657
-langfun/env/event_handlers/event_logger.py,sha256=J5v9qPZk20ZscYU1Ko0cHaYaRa45Yurz9y8Yn-UATpY,12879
-langfun/env/event_handlers/event_logger_test.py,sha256=HDSO09eFEKIdMYSM_8UHDKhNhSXuqM6Tif63d0kAGjs,9130
-langfun/env/event_handlers/metric_writer.py,sha256=ABxvIkCJXtGpVb2KoaMqc61yMPhaHCoWB1gQraUqlEk,19793
+langfun/env/event_handlers/chain.py,sha256=MrAF7BTVJxQyYEFrBdyGCb0b3RotBVInJm0CHySYXNo,6946
+langfun/env/event_handlers/chain_test.py,sha256=92xBFgL6NitbH8HSKZWQzK9jOm_SWyZwVywFyrxG6fc,8129
+langfun/env/event_handlers/event_logger.py,sha256=ga8RN8qjwtAOCnV_MnhNPTktN8EJ-x1qw4Z_MsnvI5A,12554
+langfun/env/event_handlers/event_logger_test.py,sha256=qSAcirtRz00H-1RL9ShELBiZKiPxsk_v6cVA6XdAk4k,9274
+langfun/env/event_handlers/metric_writer.py,sha256=7ZrUp0rYvs7TfNpQ16Xbxg8vp-6ZbjuJ-qrhVSbhv2I,21085
 langfun/env/event_handlers/metric_writer_test.py,sha256=bjdYXoXMPWpWz_-HUPM6vFP1ez5G386u0fmPfe-SR_M,5952
-langfun-0.1.2.dev202511010804.dist-info/licenses/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-langfun-0.1.2.dev202511010804.dist-info/METADATA,sha256=GkWja_YtYyrdLzgc8XtzAn4aL8nSz01TSIdgxZIq7iA,7522
-langfun-0.1.2.dev202511010804.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-langfun-0.1.2.dev202511010804.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
-langfun-0.1.2.dev202511010804.dist-info/RECORD,,
+langfun-0.1.2.dev202511030805.dist-info/licenses/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+langfun-0.1.2.dev202511030805.dist-info/METADATA,sha256=SfPYy0XHEltJkf1m7wkd3_Hy3jJ2QWCb8cNRRv7duOo,7522
+langfun-0.1.2.dev202511030805.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+langfun-0.1.2.dev202511030805.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
+langfun-0.1.2.dev202511030805.dist-info/RECORD,,