Remove changes

seamless_server/app_pubsub.py

@@ -514,16 +514,17 @@ async def join_room(sid, client_id, room_id_from_client, config_dict):
     ):
         # If something goes wrong and the server gets stuck in a locked state the client can
         # force the server to remove the lock by passing the special name ESCAPE_HATCH_SERVER_LOCK_RELEASE_NAME
-        # TEMP: remove escape hatch for demo
-        # if (
-        #     server_lock is not None
-        #     and config_dict.get("lockServerName")
-        #     == ESCAPE_HATCH_SERVER_LOCK_RELEASE_NAME
-        # ):
-        #     server_lock = None
-        #     logger.info(
-        #         f"🔓 Server lock has been reset by {client_id} using the escape hatch name {ESCAPE_HATCH_SERVER_LOCK_RELEASE_NAME}"
-        #     )
+        if (
+            server_lock is not None
+            and config_dict.get("lockServerName")
+            == ESCAPE_HATCH_SERVER_LOCK_RELEASE_NAME
+            # If we are locking the server completely we don't want someone to be able to unlock it
+            and not os.environ.get("LOCK_SERVER_COMPLETELY", "0") == "1"
+        ):
+            server_lock = None
+            logger.info(
+                f"🔓 Server lock has been reset by {client_id} using the escape hatch name {ESCAPE_HATCH_SERVER_LOCK_RELEASE_NAME}"
+            )
 
         # If the server is not locked, set a lock. If it's already locked to this client, update the lock object
         if server_lock is None or server_lock.get("client_id") == client_id:

streaming-react-app/src/StreamingInterface.tsx

@@ -955,13 +955,6 @@ export default function StreamingInterface() {
                     </Grid>
                   </Stack>
 
-                  <Typography variant="body2" sx={{color: '#65676B'}}>
-                    Note: we don't recommend echo cancellation, as it may distort
-                    the input audio (dropping words/sentences) if there is output
-                    audio playing. Instead, you should use headphones if you'd like
-                    to listen to the output audio while speaking.
-                  </Typography>
-
                   <Stack
                     direction="row"
                     spacing={2}