Added to_html for table and form value

Author: MaksOpp

unstructured/documents/ontology.py

@@ -20,6 +20,7 @@
 from enum import Enum
 from typing import List, Optional
 
+from bs4 import BeautifulSoup
 from pydantic import BaseModel, Field
 
 
@@ -75,32 +76,36 @@ def generate_unique_id() -> str:
 
     def to_html(self, add_children=True) -> str:
         additional_attrs = copy(self.additional_attributes)
-        if "class" in additional_attrs:
-            del additional_attrs["class"]
-
-        # TODO(Pluto) Add support for multiple classes
-        attrs = " ".join(
-            f'{key}="{value}"' if value else f"{key}" for key, value in additional_attrs.items()
-        )
+        additional_attrs.pop("class", None)
 
+        attr_str = self._construct_attribute_string(additional_attrs)
         class_attr = f'class="{self.css_class_name}"' if self.css_class_name else ""
-        attr_str = f"{class_attr} {attrs}".strip()
 
-        children_html = (
-            ("" if not self.children else "".join(child.to_html() for child in self.children))
-            if add_children
-            else ""
+        combined_attr_str = f"{class_attr} {attr_str}".strip()
+
+        children_html = self._generate_children_html(add_children)
+
+        result_html = self._generate_final_html(combined_attr_str, children_html)
+
+        return result_html
+
+    def _construct_attribute_string(self, attributes: dict) -> str:
+        return " ".join(
+            f'{key}="{value}"' if value else f"{key}" for key, value in attributes.items()
         )
-        text = "" if not self.text else self.text
+
+    def _generate_children_html(self, add_children: bool) -> str:
+        if not add_children or not self.children:
+            return ""
+        return "".join(child.to_html() for child in self.children)
+
+    def _generate_final_html(self, attr_str: str, children_html: str) -> str:
+        text = self.text or ""
 
         if text or children_html:
-            # This is either one or another, never both
-            result_html = (
-                f"<{self.html_tag_name} {attr_str}>{text} {children_html}</{self.html_tag_name}>"
-            )
+            return f"<{self.html_tag_name} {attr_str}>{text} {children_html}</{self.html_tag_name}>"
         else:
-            result_html = f"<{self.html_tag_name} {attr_str} />"
-        return result_html
+            return f"<{self.html_tag_name} {attr_str} />"
 
     @property
     def id(self) -> str | None:
@@ -254,6 +259,24 @@ class Table(OntologyElement):
     elementType: ElementTypeEnum = Field(ElementTypeEnum.table, frozen=True)
     allowed_tags: List[str] = Field(["table"], frozen=True)
 
+    def to_html(self, add_children=True) -> str:
+        raw_html = super().to_html(add_children=add_children)
+
+        cleaned_html = self._remove_ids_and_classes(raw_html)
+
+        return cleaned_html
+
+    def _remove_ids_and_classes(self, html: str) -> str:
+        soup = BeautifulSoup(html, "html.parser")
+
+        for tag in soup.find_all(True):
+            if "id" in tag.attrs:
+                del tag.attrs["id"]
+            if "class" in tag.attrs:
+                del tag.attrs["class"]
+
+        return str(soup)
+
 
 class TableBody(OntologyElement):
     description: str = Field("A body of the table", frozen=True)
@@ -446,6 +469,18 @@ def __init__(self, **kwargs):
         super().__init__(**kwargs)
         self.text = self.additional_attributes.get("value", "")
 
+    def to_html(self, add_children=True) -> str:
+        additional_attrs = copy(self.additional_attributes)
+        additional_attrs.pop("class", None)
+
+        attr_str = self._construct_attribute_string(additional_attrs)
+
+        class_attr = f'class="{self.css_class_name}"' if self.css_class_name else ""
+
+        combined_attr_str = f"{class_attr} {attr_str}".strip()
+
+        return f"<{self.html_tag_name} {combined_attr_str} />"
+
 
 class Checkbox(OntologyElement):
     description: str = Field("A small box that can be checked or unchecked", frozen=True)