langfun 0.1.2.dev202509210803__py3-none-any.whl → 0.1.2.dev202509230805__py3-none-any.whl

langfun/env/load_balancers.py

@@ -51,9 +51,9 @@ class RoundRobin(LoadBalancer):
       for _ in range(len(sandbox_pool)):
         sandbox = sandbox_pool[self._counter % len(sandbox_pool)]
         self._counter = self._counter + 1
-        if sandbox.is_alive and not sandbox.is_busy and not sandbox.is_pending:
-          # Mark the sandbox as pending so that it will not be acquired by other
-          # threads.
-          sandbox.set_pending()
+        if sandbox.status == interface.Sandbox.Status.READY:
+          # Mark the sandbox as acquired to prevent it from being acquired by
+          # other threads.
+          sandbox.set_acquired()
           return sandbox
     raise IndexError('No free sandbox in the pool.')

langfun/env/load_balancers_test.py

@@ -21,9 +21,7 @@ from langfun.env import load_balancers
 
 class TestingSandbox(interface.Sandbox):
   sandbox_id: str
-  is_alive: bool = True
-  is_pending: bool = False
-  is_busy: bool = False
+  status: interface.Sandbox.Status = interface.Sandbox.Status.READY
 
   def _on_bound(self) -> None:
     super()._on_bound()
@@ -44,20 +42,27 @@ class TestingSandbox(interface.Sandbox):
   def features(self) -> dict[str, interface.Feature]:
     raise NotImplementedError()
 
-  def set_pending(self, pending: bool = True) -> None:
-    self.rebind(
-        is_pending=pending, skip_notification=True, raise_on_no_change=False
-    )
+  @property
+  def state_errors(self) -> list[interface.SandboxStateError]:
+    return []
 
-  def set_busy(self, busy: bool = True) -> None:
-    self.rebind(
-        is_busy=busy, skip_notification=True, raise_on_no_change=False
-    )
+  def set_status(self, status: interface.Sandbox.Status) -> None:
+    self.rebind(status=status, skip_notification=True)
 
-  def set_alive(self, alive: bool = True) -> None:
-    self.rebind(
-        is_alive=alive, skip_notification=True, raise_on_no_change=False
-    )
+  def set_acquired(self) -> None:
+    self.set_status(self.Status.ACQUIRED)
+
+  def add_event_handler(
+      self,
+      event_handler: interface.EnvironmentEventHandler
+  ) -> None:
+    pass
+
+  def remove_event_handler(
+      self,
+      event_handler: interface.EnvironmentEventHandler
+  ) -> None:
+    pass
 
   def start(self) -> None:
     self.set_alive()
@@ -65,9 +70,6 @@ class TestingSandbox(interface.Sandbox):
   def shutdown(self) -> None:
     self.set_alive(False)
 
-  def ping(self) -> None:
-    pass
-
   def start_session(self, session_id: str) -> None:
     self._session_id = session_id
 
@@ -83,50 +85,25 @@ class RoundRobinTest(unittest.TestCase):
 
   def test_basic(self):
     sandbox_pool = [
-        TestingSandbox(
-            '0',
-            is_alive=False,
-            is_pending=False,
-            is_busy=False,
-        ),
-        TestingSandbox(
-            '1',
-            is_alive=True,
-            is_pending=True,
-            is_busy=False,
-        ),
-        TestingSandbox(
-            '2',
-            is_alive=True,
-            is_pending=False,
-            is_busy=True,
-        ),
-        TestingSandbox(
-            '3',
-            is_alive=True,
-            is_pending=False,
-            is_busy=False,
-        ),
-        TestingSandbox(
-            '4',
-            is_alive=True,
-            is_pending=False,
-            is_busy=False,
-        ),
+        TestingSandbox('0', interface.Sandbox.Status.OFFLINE),
+        TestingSandbox('1', interface.Sandbox.Status.SETTING_UP),
+        TestingSandbox('2', interface.Sandbox.Status.IN_SESSION),
+        TestingSandbox('3', status=interface.Sandbox.Status.READY),
+        TestingSandbox('4', status=interface.Sandbox.Status.READY),
     ]
     lb = load_balancers.RoundRobin()
     sandbox = lb.acquire(sandbox_pool)
     self.assertIs(sandbox, sandbox_pool[3])
-    self.assertTrue(sandbox.is_pending)
+    self.assertEqual(sandbox.status, interface.Sandbox.Status.ACQUIRED)
 
     sandbox = lb.acquire(sandbox_pool)
     self.assertIs(sandbox, sandbox_pool[4])
-    self.assertTrue(sandbox.is_pending)
+    self.assertEqual(sandbox.status, interface.Sandbox.Status.ACQUIRED)
 
-    sandbox_pool[0].set_alive()
+    sandbox_pool[0].set_status(interface.Sandbox.Status.READY)
     sandbox = lb.acquire(sandbox_pool)
     self.assertIs(sandbox, sandbox_pool[0])
-    self.assertTrue(sandbox.is_pending)
+    self.assertEqual(sandbox.status, interface.Sandbox.Status.ACQUIRED)
 
     with self.assertRaisesRegex(IndexError, 'No free sandbox in the pool.'):
       lb.acquire(sandbox_pool)
@@ -139,13 +116,11 @@ class RoundRobinTest(unittest.TestCase):
     def _thread_func(i):
       sandbox = lb.acquire(sandbox_pool)
       time.sleep(0.1)
-      sandbox.set_busy()
-      sandbox.set_pending(False)
+      sandbox.set_status(interface.Sandbox.Status.IN_SESSION)
       time.sleep(0.1)
-      sandbox.set_busy(False)
-      sandbox.set_alive(False)
+      sandbox.set_status(interface.Sandbox.Status.OFFLINE)
       time.sleep(0.1)
-      sandbox.set_alive()
+      sandbox.set_status(interface.Sandbox.Status.READY)
       return i
 
     with concurrent.futures.ThreadPoolExecutor(max_workers=64) as executor:

{langfun-0.1.2.dev202509210803.dist-info → langfun-0.1.2.dev202509230805.dist-info}/METADATA

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

{langfun-0.1.2.dev202509210803.dist-info → langfun-0.1.2.dev202509230805.dist-info}/RECORD

@@ -165,17 +165,17 @@ 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=YB44mvoCNiqWP48ITExQKZ3yHGoskFGB1pYRUEwWdbc,1582
-langfun/env/base_environment.py,sha256=BMdSpsk0uMCPklrZ7XQPpJ03IL3ZEzCIs3RlUfG8yNo,14215
-langfun/env/base_feature.py,sha256=C3s9ovV7MPOBGNM9evfABVkGxcfazX8A03Jb_RB1MW0,4936
-langfun/env/base_sandbox.py,sha256=SWDU3Mez7FVctpMwePbcavru3GkdTsC59neWz8MqTis,14126
-langfun/env/base_test.py,sha256=FuytEQJeKnxX_VEW0axdEoCg1A1d2rIVQss0qxoPPAQ,26739
-langfun/env/interface.py,sha256=4Q6ewOtj8XJyy8OEQqSYwogjzfvivFOljGS5txhlx_U,21534
+langfun/env/__init__.py,sha256=WOht-DaYtVmO8U-viQbWmCUCCPcJwBELBiQYUfGAG5w,1532
+langfun/env/base_environment.py,sha256=73d6hs2XhJd2IK--H7Pfs-1PG5TfJ89x_yk94doq0G0,16465
+langfun/env/base_feature.py,sha256=lphS2GmwCYR-ypPGIzn0KcLzxUcO2l9R2ZbJqcqOkOI,5794
+langfun/env/base_sandbox.py,sha256=c-HskeubKOH-P2ZrQG3HFKkhtX3ZADYj4QIMemQNGbo,32202
+langfun/env/base_test.py,sha256=CIzZjfSkZEDsHARF4aoOZfq5T8DN8i8AW-swFsFw0Gk,60328
+langfun/env/interface.py,sha256=wOu_yQO8uEt5lU88FeqqaInBLg7WgYYtVeGtPsanE90,29031
 langfun/env/interface_test.py,sha256=nrqFLtpHd0vnOjoIX9cjV5WD1c-7J3WW29aogNu_94A,1395
-langfun/env/load_balancers.py,sha256=jbT3pB7QpPVovbXeJK1PNohUcrYrJNtWU8KaWzxO9nI,1963
-langfun/env/load_balancers_test.py,sha256=bAjC89zxmROpkl56BqvMU_yKOJ03Gtu8x8j56HO5HNc,4124
-langfun-0.1.2.dev202509210803.dist-info/licenses/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
-langfun-0.1.2.dev202509210803.dist-info/METADATA,sha256=vM6vqQ9UBaWpJXCpHz-3LGYTomdhKUKzrK5TX-F8nrw,7380
-langfun-0.1.2.dev202509210803.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-langfun-0.1.2.dev202509210803.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
-langfun-0.1.2.dev202509210803.dist-info/RECORD,,
+langfun/env/load_balancers.py,sha256=qRhCthqzjZIQBwta8qC1C0s0J-VQAVomJQqI7Nqv-r4,1948
+langfun/env/load_balancers_test.py,sha256=gJKJ3K5_WS7hsz9Jv3nPEjlb04Z6MmrZpfCu86siYKU,3967
+langfun-0.1.2.dev202509230805.dist-info/licenses/LICENSE,sha256=WNHhf_5RCaeuKWyq_K39vmp9F28LxKsB4SpomwSZ2L0,11357
+langfun-0.1.2.dev202509230805.dist-info/METADATA,sha256=8CisrxNc9tgTL4Ols2b5jK4H9vEwTokwFuDNipS1X9s,7380
+langfun-0.1.2.dev202509230805.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+langfun-0.1.2.dev202509230805.dist-info/top_level.txt,sha256=RhlEkHxs1qtzmmtWSwYoLVJAc1YrbPtxQ52uh8Z9VvY,8
+langfun-0.1.2.dev202509230805.dist-info/RECORD,,