langfun 0.1.2.dev202509170804__tar.gz → 0.1.2.dev202509190804__tar.gz

{langfun-0.1.2.dev202509170804 → langfun-0.1.2.dev202509190804}/PKG-INFO

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

{langfun-0.1.2.dev202509170804 → langfun-0.1.2.dev202509190804}/langfun/env/__init__.py

@@ -35,3 +35,5 @@ from langfun.env.base_feature import BaseFeature
 
 from langfun.env import load_balancers
 from langfun.env.load_balancers import LoadBalancer
+
+# Google-internal imports.

{langfun-0.1.2.dev202509170804 → langfun-0.1.2.dev202509190804}/langfun/env/base_feature.py

@@ -105,8 +105,9 @@ class BaseFeature(interface.Feature):
     self.__dict__.pop('name', None)
 
   @property
-  def sandbox(self) -> interface.Sandbox | None:
+  def sandbox(self) -> interface.Sandbox:
     """Returns the sandbox that the feature is running in."""
+    assert self._sandbox is not None, 'Feature has not been set up yet.'
     return self._sandbox
 
   #
@@ -123,6 +124,12 @@ class BaseFeature(interface.Feature):
 
   def teardown(self) -> None:
     """Tears down the feature."""
+    # If a sandbox is down during setting up, feature.shutdown might be called
+    # before the feature is setup. In this case, we don't need to teardown the
+    # feature.
+    if self._sandbox is None:
+      return
+
     interface.call_with_event(
         action=self._teardown,
         event_handler=self.on_teardown,

{langfun-0.1.2.dev202509170804 → langfun-0.1.2.dev202509190804}/langfun/env/base_sandbox.py

@@ -91,14 +91,24 @@ class BaseSandbox(interface.Sandbox):
   def _start_session(self, session_id: str) -> None:
     """Starts a user session."""
     self._session_id = session_id
+    self._session_start_time = time.time()
+
     for feature in self._features.values():
       feature.setup_session(session_id)
 
   def _end_session(self) -> None:
-    """Ends the user session with the sandbox."""
-    for feature in self._features.values():
-      feature.teardown_session(self._session_id)
-    self._session_id = None
+    try:
+      for feature in self._features.values():
+        feature.teardown_session(self._session_id)
+    finally:
+      pg.logging.info(
+          '[%s]: User session %s ended. (lifetime: %.2f seconds).',
+          self.id,
+          self._session_id,
+          time.time() - self._session_start_time
+      )
+      self._session_id = None
+      self._session_start_time = None
 
   def _ping(self) -> None:
     """Implementation of ping for health checking."""
@@ -115,6 +125,7 @@ class BaseSandbox(interface.Sandbox):
         for name, feature in self.environment.features.items()
     })
     self._session_id = None
+    self._session_start_time = None
     self._alive = False
     self._start_time = None
 
@@ -197,6 +208,7 @@ class BaseSandbox(interface.Sandbox):
       return
 
     self._alive = False
+    shutdown_start_time = time.time()
     def shutdown_impl():
       self._teardown_features()
       self._shutdown()
@@ -205,8 +217,10 @@ class BaseSandbox(interface.Sandbox):
         self._housekeep_thread.join()
         self._housekeep_thread = None
       pg.logging.info(
-          '[%s]: Sandbox shutdown in %.2f seconds.',
-          self.id, time.time() - self._start_time
+          '[%s]: Sandbox shutdown in %.2f seconds. (lifetime: %.2f seconds)',
+          self.id,
+          time.time() - shutdown_start_time,
+          time.time() - self._start_time if self._start_time else 0
       )
 
     interface.call_with_event(

{langfun-0.1.2.dev202509170804 → langfun-0.1.2.dev202509190804}/langfun.egg-info/PKG-INFO

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