Supplement valid report types and add a guid in the top-level template's JSON

doc/source/examples_source/25-intermediate/02-json.py

@@ -20,7 +20,7 @@
 # -------------------------------------------
 #
 # Start a new ADR service. Make sure the database directory is empty. Use the get_list_report
-# method to check that there are no reports in the datanase.
+# method to check that there are no reports in the database.
 
 import ansys.dynamicreporting.core as adr
 import ansys.dynamicreporting.core.examples as examples

src/ansys/dynamicreporting/core/utils/report_remote_server.py

@@ -978,9 +978,9 @@ def get_pptx_from_report(self, report_guid, directory_name=None, query=None):
         else:
             raise Exception(f"The server returned an error code {resp.status_code}")
 
-    def get_report_types(self):
+    def get_layout_types(self):
         """
-        Return a list of valid report types
+        Return a list of valid layout types as in report types (not including BETA)
         """
         return [
             "Layout:basic",
@@ -999,6 +999,29 @@ def get_report_types(self):
             "Layout:datafilter",
         ]
 
+    def get_generator_types(self):
+        """
+        Return a list of valid generator types as in report types
+        """
+        return [
+            "Generator:tablemerge",
+            "Generator:tablereduce",
+            "Generator:tablerowcolumnfilter",
+            "Generator:tablevaluefilter",
+            "Generator:tablesortfilter",
+            "Generator:sqlquery",
+            "Generator:treemerge",
+            "Generator:itemscomparison",
+            "Generator:statistical",
+            # "Generator:iterator",
+        ]
+
+    def get_report_types(self):
+        """
+        Return a list of valid report types
+        """
+        return self.get_layout_types() + self.get_generator_types()
+
     def get_templates_as_json(self, root_guid):
         """
         Convert report templates rooted as root_guid to JSON
@@ -1206,6 +1229,7 @@ def _build_template_data(self, guid, templates_data, templates, template_guid_id
         templates_data[curr_template_key]["sort_selection"] = curr_template.get_sort_selection()
         if curr_template.parent is None:
             templates_data[curr_template_key]["parent"] = None
+            templates_data[curr_template_key]["guid"] = str(uuid.uuid4())
         else:
             templates_data[curr_template_key][
                 "parent"