Stop sending the existing events as text to the events generation (#9056)

Don't show in changelog

Author: 4ian

newIDE/app/src/AiGeneration/UseGenerateEvents.js

@@ -22,7 +22,6 @@ type UseGenerateEventsReturnType = {
   generateEvents: ({
     eventsDescription: string | null,
     eventBatches: Array<EventBatch> | null,
-    existingEventsAsText: string,
     existingEventsJson: string | null,
     extensionNamesList: string,
     objectsList: string,
@@ -48,7 +47,6 @@ export const useGenerateEvents = ({
       eventBatches,
       extensionNamesList,
       objectsList,
-      existingEventsAsText,
       existingEventsJson,
       placementHint,
       relatedAiRequestId,
@@ -59,7 +57,6 @@ export const useGenerateEvents = ({
       eventBatches: Array<EventBatch> | null,
       extensionNamesList: string,
       objectsList: string,
-      existingEventsAsText: string,
       existingEventsJson: string | null,
       placementHint: string | null,
       relatedAiRequestId: string,
@@ -105,7 +102,6 @@ export const useGenerateEvents = ({
               eventBatches,
               extensionNamesList,
               objectsList,
-              existingEventsAsText,
               placementHint,
               relatedAiRequestId,
               estimatedComplexity,

newIDE/app/src/EditorFunctions/AddSceneEvents.spec.js

@@ -138,7 +138,6 @@ describe('add_scene_events', () => {
     eventsDescription: 'Some events',
     extensionNamesList: '',
     objectsList: 'Player',
-    existingEventsAsText: '',
     existingEventsJson: null,
     existingEventsJsonUserRelativeKey: null,
     resultMessage: 'Successfully added events.',

newIDE/app/src/EditorFunctions/EditorFunctions.spec.js

@@ -1799,7 +1799,6 @@ describe('editorFunctions', () => {
               'When the player presses space, play an explosion sound and show an explosion effect',
             extensionNamesList: '',
             objectsList: 'Player',
-            existingEventsAsText: '',
             existingEventsJson: null,
             existingEventsJsonUserRelativeKey: null,
             resultMessage: 'Successfully added explosion events.',
@@ -1904,7 +1903,6 @@ describe('editorFunctions', () => {
               'When the player presses space, play an explosion sound and the boss music',
             extensionNamesList: '',
             objectsList: 'Player',
-            existingEventsAsText: '',
             existingEventsJson: null,
             existingEventsJsonUserRelativeKey: null,
             resultMessage: 'Successfully added sound events.',

newIDE/app/src/EditorFunctions/index.js

@@ -280,7 +280,6 @@ export type EventsGenerationOptions = {|
   eventBatches: Array<EventBatch> | null,
   extensionNamesList: string,
   objectsList: string,
-  existingEventsAsText: string,
   existingEventsJson: string | null,
   placementHint: string | null,
   relatedAiRequestId: string,
@@ -5734,9 +5733,8 @@ const addSceneEvents: EditorFunction = {
     const scene = project.getLayout(sceneName);
     const currentSceneEvents = scene.getEvents();
 
-    const existingEventsAsText = renderNonTranslatedEventsAsText({
-      eventsList: currentSceneEvents,
-    });
+    // The existing events are sent as JSON only: the generation backend
+    // renders them itself (as a bounded EventScript view) for its model.
     const existingEventsJson =
       toolOptions && toolOptions.includeEventsJson
         ? serializeToJSON(currentSceneEvents)
@@ -5841,7 +5839,6 @@ const addSceneEvents: EditorFunction = {
           eventBatches: parsedEventBatches,
           extensionNamesList,
           objectsList,
-          existingEventsAsText,
           existingEventsJson,
           placementHint,
           relatedAiRequestId,

newIDE/app/src/EventsSheet/EventsTree/TextRenderer/EventScriptRenderer.js

@@ -600,6 +600,12 @@ export const renderEventAsEventScriptLines = ({
       lines.push(
         `${bodyIndent}# ... ${eventsCount} sub-event(s) (${instructionsCount} action(s)) not shown: read event_ids: ["event-${eventPath}"] to see them.`
       );
+      // A group must contain at least one event for the parser: the marker
+      // is a comment, so make the (collapsed) body explicit with `pass` to
+      // keep the rendering valid EventScript.
+      if (event.getType() === 'BuiltinCommonInstructions::Group') {
+        lines.push(`${bodyIndent}pass`);
+      }
     }
   }
 

newIDE/app/src/EventsSheet/EventsTree/TextRenderer/EventScriptRenderer.spec.js

@@ -224,4 +224,35 @@ describe('EventScriptRenderer', () => {
       project.delete();
     }
   });
+
+  it('keeps a collapsed group valid EventScript with an explicit `pass`', () => {
+    const { project } = makeTestProject(gd);
+    try {
+      const eventsList = makeEventsList(project, [
+        {
+          type: 'BuiltinCommonInstructions::Group',
+          name: 'My group',
+          events: sceneStartSerializedEvents,
+        },
+      ]);
+
+      const { text, renderingErrors } = renderEventsAsEventScript({
+        eventsList,
+        subEventsDepth: 0,
+      });
+
+      expect(renderingErrors).toEqual([]);
+      // A group must contain at least one event for the parser: the marker
+      // alone (a comment) would not do.
+      expect(text).toBe(
+        [
+          'group "My group":  # event-0',
+          '  # ... 2 sub-event(s) (3 action(s)) not shown: read event_ids: ["event-0"] to see them.',
+          '  pass',
+        ].join('\n')
+      );
+    } finally {
+      project.delete();
+    }
+  });
 });

newIDE/app/src/Utils/GDevelopServices/Generation.js

@@ -237,7 +237,6 @@ export type AiGeneratedEvent = {
   eventBatches: Array<AiGeneratedEventBatch> | null,
   extensionNamesList: string,
   objectsList: string,
-  existingEventsAsText: string,
   existingEventsJson: string | null,
   existingEventsJsonUserRelativeKey: string | null,
 
@@ -735,7 +734,6 @@ export const createAiGeneratedEvent = async (
     eventBatches,
     extensionNamesList,
     objectsList,
-    existingEventsAsText,
     existingEventsJson,
     existingEventsJsonUserRelativeKey,
     placementHint,
@@ -752,7 +750,6 @@ export const createAiGeneratedEvent = async (
     eventBatches: Array<AiGeneratedEventBatch> | null,
     extensionNamesList: string,
     objectsList: string,
-    existingEventsAsText: string,
     existingEventsJson: string | null,
     existingEventsJsonUserRelativeKey: string | null,
     placementHint: string | null,
@@ -774,7 +771,6 @@ export const createAiGeneratedEvent = async (
       eventBatches,
       extensionNamesList,
       objectsList,
-      existingEventsAsText,
       existingEventsJson,
       existingEventsJsonUserRelativeKey,
       placementHint,