Attempt to fix XManager cli

etils/epath/gpath.py

@@ -63,7 +63,7 @@
 @functools.cache
 def _is_tf_installed() -> bool:
   """Checks whether TensorFlow is installed."""
-  if os.environ.get('EPATH_USE_TF', '').lower() in ['false', 'no', 'f', '0']:
+  if os.environ['EPATH_USE_TF'].lower() in ['false', 'no', 'f', '0']:
     return False
   return importlib.util.find_spec('tensorflow') is not None
 

etils/epy/binary_import.py

@@ -20,24 +20,17 @@
 import sys
 from typing import Any
 
-import __main__  # pylint: disable=g-bad-import-order
 from etils.epy import py_utils
 
 
 @functools.cache
 def _is_ipython_terminal() -> bool:
   """Returns True if running in a IPython terminal/XManager CLI environment."""
   # XManager CLI trigger binary imports
-
-  # `epy` is imported before the `runpy.run_module(`, so main is still the
-  # XManager binary
-  if __main__.__file__.endswith('xmanager2/client/cli/xm_cli.py'):
-    return True
-
-  # In case `epy` is imported after the XManager CLI, detecting we're in
-  # `xmanager launch` is non-trivial because the script is launched with
-  # `runpy.run_module(`, hiding some XManager internals and overwriting
-  # `__main__`.
+  # Detecting we're in `xmanager launch` is non-trivial because the script
+  # is launched with `runpy.run_module(`, hiding some XManager internals.
+  # Otherwise we could have checked if `__main__.__file__.endswith('xm_cli')`,
+  # but `__main__` get overwritten here.
   if any(flag.startswith('--xm_launch_script=') for flag in sys.argv):
     return True