From e44ff707e8af813febb9d4ddc36c34da49096a8f Mon Sep 17 00:00:00 2001
From: James Rosewell <james@51degrees.com>
Date: Tue, 10 Nov 2026 20:31:03 +0000
Subject: [PATCH 1/2] Test that the JSON Builder leaves out the Cloud Request
 Engine's data

---
 .../tests/test_jsonbundler_excludes.py        | 58 +++++++++++++++++++
 1 file changed, 58 insertions(+)
 create mode 100644 pipeline/fiftyone_pipeline_core/tests/test_jsonbundler_excludes.py

diff --git a/pipeline/fiftyone_pipeline_core/tests/test_jsonbundler_excludes.py b/pipeline/fiftyone_pipeline_core/tests/test_jsonbundler_excludes.py
new file mode 100644
index 00000000..204f0b83
--- /dev/null
+++ b/pipeline/fiftyone_pipeline_core/tests/test_jsonbundler_excludes.py
@@ -0,0 +1,58 @@
+# *********************************************************************
+# This Original Work is copyright of 51 Degrees Mobile Experts Limited.
+# Copyright 2026 51 Degrees Mobile Experts Limited, Davidson House,
+# Forbury Square, Reading, Berkshire, United Kingdom RG1 3EU.
+#
+# This Original Work is licensed under the European Union Public Licence
+# (EUPL) v.1.2 and is subject to its terms as set out below.
+#
+# If a copy of the EUPL was not distributed with this file, You can obtain
+# one at https://opensource.org/licenses/EUPL-1.2.
+#
+# The 'Compatible Licences' set out in the Appendix to the EUPL (as may be
+# amended by the European Commission) shall be deemed incompatible for
+# the purposes of the Work and the provisions of the compatibility
+# clause in Article 5 of the EUPL shall not apply.
+#
+# If using the Work as, or as part of, a network application, by
+# including the attribution notice(s) required under Article 5 of the EUPL
+# in the end user terms of the application under an appropriate heading,
+# such notice(s) shall fulfill the requirements of that article.
+# *********************************************************************
+
+"""The JSON Builder leaves the Cloud Request Engine's Element Data out of the
+JSON, as the JSON Builder specification says."""
+
+import unittest
+
+from fiftyone_pipeline_core.elementdata_dictionary import ElementDataDictionary
+from fiftyone_pipeline_core.flowelement import FlowElement
+from fiftyone_pipeline_core.pipelinebuilder import PipelineBuilder
+
+
+class StandInCloudRequestEngine(FlowElement):
+    """Writes the raw answer under the Cloud Request Engine's data key."""
+
+    def __init__(self):
+        super(StandInCloudRequestEngine, self).__init__()
+        self.datakey = "cloud"
+        self.properties = {"cloud": {"name": "cloud", "type": "string"}}
+
+    def process_internal(self, flowdata):
+        flowdata.set_element_data(ElementDataDictionary(
+            self, {"cloud": '{"device":{"ismobile":true}}'}))
+
+
+class JsonBuilderExcludesTests(unittest.TestCase):
+
+    def test_the_cloud_request_engine_is_left_out(self):
+        pipeline = PipelineBuilder({}).add(StandInCloudRequestEngine()) \
+            .build()
+        self.addCleanup(pipeline.close)
+        flowdata = pipeline.create_flowdata()
+        flowdata.process()
+        self.assertNotIn("cloud", flowdata.jsonbundler.json)
+
+
+if __name__ == "__main__":
+    unittest.main()

From 3a5d4b3dc6b506d7e4e5a1fb9d2e523d8dca0a82 Mon Sep 17 00:00:00 2001
From: James Rosewell <james@51degrees.com>
Date: Tue, 10 Nov 2026 20:31:09 +0000
Subject: [PATCH 2/2] Leave the Cloud Request Engine's data out of the JSON, as
 the specification says

---
 .../src/fiftyone_pipeline_core/jsonbundler.py                  | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/pipeline/fiftyone_pipeline_core/src/fiftyone_pipeline_core/jsonbundler.py b/pipeline/fiftyone_pipeline_core/src/fiftyone_pipeline_core/jsonbundler.py
index 030cba4a..d969c1c9 100644
--- a/pipeline/fiftyone_pipeline_core/src/fiftyone_pipeline_core/jsonbundler.py
+++ b/pipeline/fiftyone_pipeline_core/src/fiftyone_pipeline_core/jsonbundler.py
@@ -127,7 +127,8 @@ def process_internal(self, flowdata):
             if (flow_element.datakey == "jsonbundler" or
                 flow_element.datakey == "sequence" or 
                 flow_element.datakey == "javascriptbuilder" or
-                flow_element.datakey == "set-headers"):
+                flow_element.datakey == "set-headers" or
+                flow_element.datakey == "cloud"):
                 continue
             
             properties = flow_element.get_properties()