Remove editor toolbar and concurrent updates code (unshipping for v1) (#1244)

Author: wwwillchen

.github/workflows/ci.yml

@@ -64,14 +64,6 @@ jobs:
           name: playwright-report-concurrency
           path: playwright-report-concurrency/
           retention-days: 30
-      - name: Run playwright test with concurrent updates enabled
-        run: MESOP_CONCURRENT_UPDATES_ENABLED=true PLAYWRIGHT_HTML_OUTPUT_DIR=playwright-report-with-concurrent-updates-enabled yarn playwright test
-      - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0
-        if: always()
-        with:
-          name: playwright-report-with-concurrent-updates-enabled
-          path: playwright-report-with-concurrent-updates-enabled/
-          retention-days: 30
       - name: Run playwright test with websockets enabled
         run: MESOP_WEBSOCKETS_ENABLED=true PLAYWRIGHT_HTML_OUTPUT_DIR=playwright-report-with-websockets-enabled yarn playwright test
       - uses: actions/upload-artifact@65c4c4a1ddee5b72f698fdd19549f0f0fb45cf08 # v4.6.0

docs/api/config.md

@@ -245,7 +245,7 @@ These configuration values are experimental and are subject to breaking change,
 
 !!! danger "Deprecated experimental feature"
 
-      This experimental feature is deprecated and will be removed in an upcoming release. Use `MESOP_WEBSOCKETS_ENABLED` instead.
+      This experimental feature has been removed in Mesop v1. Use `MESOP_WEBSOCKETS_ENABLED` instead.
 
 Allows concurrent updates to state in the same session. If this is not updated, then updates are queued and processed sequentially.
 

mesop/env/env.py

@@ -12,11 +12,6 @@
   # working directory.
   load_dotenv(find_dotenv(usecwd=True))
 
-
-AI_SERVICE_BASE_URL = os.environ.get(
-  "MESOP_AI_SERVICE_BASE_URL", "http://localhost:43234"
-)
-
 MESOP_APP_BASE_PATH = os.environ.get("MESOP_APP_BASE_PATH", "")
 if MESOP_APP_BASE_PATH:
   if not os.path.isabs(MESOP_APP_BASE_PATH):
@@ -42,15 +37,3 @@ def get_app_base_path() -> str:
 MESOP_WEBSOCKETS_ENABLED = (
   os.environ.get("MESOP_WEBSOCKETS_ENABLED", "false").lower() == "true"
 )
-
-MESOP_CONCURRENT_UPDATES_ENABLED = (
-  os.environ.get("MESOP_CONCURRENT_UPDATES_ENABLED", "false").lower() == "true"
-)
-
-if MESOP_WEBSOCKETS_ENABLED:
-  MESOP_CONCURRENT_UPDATES_ENABLED = True
-
-
-EXPERIMENTAL_EDITOR_TOOLBAR_ENABLED = (
-  os.environ.get("MESOP_EXPERIMENTAL_EDITOR_TOOLBAR", "false").lower() == "true"
-)

mesop/server/server.py

@@ -16,9 +16,7 @@
 import mesop.protos.ui_pb2 as pb
 from mesop.component_helpers import diff_component
 from mesop.env.env import (
-  EXPERIMENTAL_EDITOR_TOOLBAR_ENABLED,
   MESOP_APP_BASE_PATH,
-  MESOP_CONCURRENT_UPDATES_ENABLED,
   MESOP_PROD_UNREDACTED_ERRORS,
   MESOP_WEBSOCKETS_ENABLED,
 )
@@ -48,13 +46,7 @@ def configure_flask_app(
   *, prod_mode: bool = True, exceptions_to_propagate: Sequence[type] = ()
 ) -> Flask:
   if MESOP_WEBSOCKETS_ENABLED:
-    logger.info(
-      "Experiment enabled: MESOP_WEBSOCKETS_ENABLED (auto-enables MESOP_CONCURRENT_UPDATES_ENABLED)"
-    )
-  elif MESOP_CONCURRENT_UPDATES_ENABLED:
-    logger.info("Experiment enabled: MESOP_CONCURRENT_UPDATES_ENABLED")
-  if EXPERIMENTAL_EDITOR_TOOLBAR_ENABLED:
-    logger.info("Experiment enabled: EXPERIMENTAL_EDITOR_TOOLBAR_ENABLED")
+    logger.info("Experiment enabled: MESOP_WEBSOCKETS_ENABLED")
 
   if MESOP_APP_BASE_PATH:
     logger.info(f"MESOP_APP_BASE_PATH set to {MESOP_APP_BASE_PATH}")

mesop/server/server_debug_routes.py

@@ -1,139 +1,11 @@
-import inspect
-import json
 import time
-from urllib import request as urllib_request
-from urllib.error import URLError
 
 from flask import Flask, Response, request
 
-from mesop.env.env import AI_SERVICE_BASE_URL
 from mesop.runtime import runtime
-from mesop.server.server_utils import (
-  check_editor_access,
-  make_sse_response,
-  sse_request,
-)
 
 
 def configure_debug_routes(flask_app: Flask):
-  @flask_app.route("/__editor__/commit", methods=["POST"])
-  def page_commit() -> Response:
-    check_editor_access()
-
-    try:
-      data = request.get_json()
-    except json.JSONDecodeError:
-      return Response("Invalid JSON format", status=400)
-    code = data.get("code")
-    path = data.get("path")
-    page_config = runtime().get_page_config(path=path)
-    assert page_config
-    module = inspect.getmodule(page_config.page_fn)
-    assert module
-    module_file = module.__file__
-    assert module_file
-    module_file_path = module.__file__
-    assert module_file_path
-    with open(module_file_path, "w") as file:
-      file.write(code)
-
-    response_data = {"message": "Page commit successful"}
-    return Response(
-      json.dumps(response_data), status=200, mimetype="application/json"
-    )
-
-  @flask_app.route("/__editor__/save-interaction", methods=["POST"])
-  def save_interaction() -> Response | dict[str, str]:
-    check_editor_access()
-
-    data = request.get_json()
-    if not data:
-      return Response("Invalid JSON data", status=400)
-
-    try:
-      req = urllib_request.Request(
-        AI_SERVICE_BASE_URL + "/save-interaction",
-        data=json.dumps(data).encode("utf-8"),
-        headers={"Content-Type": "application/json"},
-      )
-      with urllib_request.urlopen(req) as response:
-        if response.status == 200:
-          folder = json.loads(response.read().decode("utf-8"))["folder"]
-          return {"folder": folder}
-        else:
-          print(f"Error from AI service: {response.read().decode('utf-8')}")
-          return Response(
-            f"Error from AI service: {response.read().decode('utf-8')}",
-            status=500,
-          )
-    except URLError as e:
-      return Response(f"Error making request to AI service: {e!s}", status=500)
-
-  @flask_app.route("/__editor__/generate", methods=["POST"])
-  def page_generate():
-    check_editor_access()
-
-    try:
-      data = request.get_json()
-    except json.JSONDecodeError:
-      return Response("Invalid JSON format", status=400)
-    if not data:
-      return Response("Invalid JSON data", status=400)
-
-    prompt = data.get("prompt")
-    if not prompt:
-      return Response("Missing 'prompt' in JSON data", status=400)
-
-    path = data.get("path")
-    page_config = runtime().get_page_config(path=path)
-
-    line_number = data.get("lineNumber")
-    assert page_config
-    module = inspect.getmodule(page_config.page_fn)
-    if module is None:
-      return Response("Could not retrieve module source code.", status=500)
-    module_file = module.__file__
-    assert module_file
-    with open(module_file) as file:
-      source_code = file.read()
-    print(f"Source code of module {module.__name__}:")
-
-    def generate():
-      try:
-        for event in sse_request(
-          AI_SERVICE_BASE_URL + "/adjust-mesop-app",
-          {"prompt": prompt, "code": source_code, "lineNumber": line_number},
-        ):
-          if event.get("type") == "end":
-            sse_data = {
-              "type": "end",
-              "prompt": prompt,
-              "path": path,
-              "beforeCode": source_code,
-              "afterCode": event["code"],
-              "diff": event["diff"],
-              "message": "Prompt processed successfully",
-            }
-            yield f"data: {json.dumps(sse_data)}\n\n"
-            break
-          elif event.get("type") == "progress":
-            sse_data = {"data": event["data"], "type": "progress"}
-            yield f"data: {json.dumps(sse_data)}\n\n"
-          elif event.get("type") == "error":
-            sse_data = {"error": event["error"], "type": "error"}
-            yield f"data: {json.dumps(sse_data)}\n\n"
-            break
-          else:
-            raise Exception(f"Unknown event type: {event}")
-      except Exception as e:
-        sse_data = {
-          "error": "Could not connect to AI service: " + str(e),
-          "type": "error",
-        }
-        yield f"data: {json.dumps(sse_data)}\n\n"
-
-    return make_sse_response(generate())
-
   @flask_app.route("/__hot-reload__")
   def hot_reload() -> Response:
     counter = int(request.args["counter"])

mesop/server/server_utils.py

@@ -6,11 +6,11 @@
 from typing import Any, Generator, Iterable
 from urllib import request as urllib_request
 
-from flask import Response, abort, request
+from flask import Response
 from werkzeug.security import safe_join
 
 import mesop.protos.ui_pb2 as pb
-from mesop.env.env import EXPERIMENTAL_EDITOR_TOOLBAR_ENABLED, get_app_base_path
+from mesop.env.env import get_app_base_path
 from mesop.exceptions import MesopDeveloperException
 from mesop.runtime import runtime
 from mesop.server.config import app_config
@@ -25,18 +25,6 @@
 STREAM_END = "data: <stream_end>\n\n"
 
 
-def check_editor_access():
-  if not EXPERIMENTAL_EDITOR_TOOLBAR_ENABLED:
-    abort(403)  # Throws a Forbidden Error
-  # Prevent accidental usages of editor mode outside of
-  # one's local computer
-  if request.remote_addr not in LOCALHOSTS:
-    abort(403)  # Throws a Forbidden Error
-  # Visual editor should only be enabled in debug mode.
-  if not runtime().debug_mode:
-    abort(403)  # Throws a Forbidden Error
-
-
 def serialize(response: pb.UiResponse) -> str:
   encoded = base64.b64encode(response.SerializeToString()).decode("utf-8")
   return f"data: {encoded}\n\n"

mesop/server/static_file_serving.py

@@ -14,8 +14,6 @@
 from werkzeug.security import safe_join
 
 from mesop.env.env import (
-  EXPERIMENTAL_EDITOR_TOOLBAR_ENABLED,
-  MESOP_CONCURRENT_UPDATES_ENABLED,
   MESOP_WEBSOCKETS_ENABLED,
   get_app_base_path,
 )
@@ -86,8 +84,6 @@ def retrieve_index_html() -> io.BytesIO | str:
       ):
         experiment_settings = {
           "websocketsEnabled": MESOP_WEBSOCKETS_ENABLED,
-          "concurrentUpdatesEnabled": MESOP_CONCURRENT_UPDATES_ENABLED,
-          "experimentalEditorToolbarEnabled": EXPERIMENTAL_EDITOR_TOOLBAR_ENABLED,
         }
         lines[i] = f"""
           <script nonce="{g.csp_nonce}">

mesop/tests/e2e/concurrent_updates_test.ts

@@ -10,16 +10,6 @@ export const testInProdOnly = base.extend({
   },
 });
 
-export const testInConcurrentUpdatesEnabledOnly = base.extend({
-  // Skip this test if MESOP_CONCURRENT_UPDATES_ENABLED is not 'true'
-  page: async ({page}, use) => {
-    if (process.env.MESOP_CONCURRENT_UPDATES_ENABLED !== 'true') {
-      base.skip(true, 'Skipping test in concurrent updates disabled mode');
-    }
-    await use(page);
-  },
-});
-
 export const testInWebSocketsEnabledOnly = base.extend({
   // Skip this test if MESOP_WEBSOCKETS_ENABLED is not 'true'
   page: async ({page}, use) => {

mesop/tests/e2e/e2e_helpers.ts

@@ -426,8 +426,8 @@ export class Channel {
       initUserEvent();
     } else {
       this.queuedEvents.push(initUserEvent);
-      if (this.experimentService.concurrentUpdatesEnabled) {
-        // We will wait 1 second to see if the server will respond with a new state.
+      if (this.experimentService.websocketsEnabled) {
+        // We will wait a bit to see if the server will respond with a new state.
         // This addresses common use cases where a user may
         // type in a text input and then click a button and
         // they would expect the updated text input state to be