sfq 0.0.36__py3-none-any.whl → 0.0.38__py3-none-any.whl

sfq/__init__.py

@@ -43,7 +43,7 @@ __all__ = [
     "__version__",
 ]
 
-__version__ = "0.0.36"
+__version__ = "0.0.38"
 """
 ### `__version__`
 
@@ -67,7 +67,7 @@ class SFAuth:
         access_token: Optional[str] = None,
         token_expiration_time: Optional[float] = None,
         token_lifetime: int = 15 * 60,
-        user_agent: str = "sfq/0.0.36",
+        user_agent: str = "sfq/0.0.38",
         sforce_client: str = "_auto",
         proxy: str = "_auto",
     ) -> None:
@@ -132,7 +132,7 @@ class SFAuth:
         self._debug_cleanup = DebugCleanup(sf_auth=self)
 
         # Store version information
-        self.__version__ = "0.0.36"
+        self.__version__ = "0.0.38"
         """
         ### `__version__`
         
@@ -565,6 +565,7 @@ class SFAuth:
     def records_to_html_table(
         self,
         items: List[Dict[str, Any]],
+        headers: Dict[str, str] = None,
         styled: bool = False,
     ) -> str:
         """
@@ -576,4 +577,4 @@ class SFAuth:
         """
         if "records" in items:
             items = items["records"]
-        return records_to_html_table(items, styled=styled)
+        return records_to_html_table(items, headers=headers, styled=styled)

sfq/http_client.py

@@ -28,7 +28,7 @@ class HTTPClient:
     def __init__(
         self,
         auth_manager: AuthManager,
-        user_agent: str = "sfq/0.0.36",
+        user_agent: str = "sfq/0.0.38",
         sforce_client: str = "_auto",
         high_api_usage_threshold: int = 80,
     ) -> None:

sfq/utils.py

@@ -197,9 +197,7 @@ def extract_org_and_user_ids(token_id_url: str) -> Tuple[str, str]:
         raise ValueError(f"Invalid token ID URL format: {token_id_url}")
 
 
-def dicts_to_html_table(
-    items: List[Dict[str, Any]], styled: bool = False
-) -> str:
+def dicts_to_html_table(items: List[Dict[str, Any]], styled: bool = False) -> str:
     """
     Convert a list of dictionaries to a compact HTML table.
 
@@ -215,7 +213,7 @@ def dicts_to_html_table(
         if val is None:
             return ""
         if isinstance(val, (int, float, str, bool)):
-            return escape(str(val))
+            return str(val)
         if isinstance(val, list):
             return (
                 "<ul>"
@@ -277,7 +275,7 @@ def dicts_to_html_table(
         )
         if columns:
             html = [f'<table style="{table_style}"><thead><tr>']
-            html.extend(f'<th style="{th_style}">{escape(col)}</th>' for col in columns)
+            html.extend(f'<th style="{th_style}">{col}</th>' for col in columns)
             html.append("</tr></thead><tbody>")
             for d in items:
                 html.append("<tr>")
@@ -294,7 +292,7 @@ def dicts_to_html_table(
     else:
         if columns:
             html = ["<table><thead><tr>"]
-            html.extend(f"<th>{escape(col)}</th>" for col in columns)
+            html.extend(f"<th>{col}</th>" for col in columns)
             html.append("</tr></thead><tbody>")
             for d in items:
                 html.append("<tr>")
@@ -309,13 +307,70 @@ def dicts_to_html_table(
 
     return "".join(html)
 
-def records_to_html_table(records: List[Dict[str, Any]], styled: bool = False) -> str:
-    """Convert a list of records to an HTML table."""
-    # really we don't want anything associated with "attributes"
-    normalized_records = []
-    for record in records:
+
+def flatten_dict(d, parent_key="", sep="."):
+    """Recursively flatten a dictionary with dot notation."""
+    items = {}
+    for k, v in d.items():
+        new_key = f"{parent_key}{sep}{k}" if parent_key else k
+        if isinstance(v, dict):
+            items.update(flatten_dict(v, new_key, sep=sep))
+        else:
+            items[new_key] = v
+    return items
+
+
+def remove_attributes(obj):
+    """Recursively remove 'attributes' key from dicts/lists."""
+    if isinstance(obj, dict):
+        return {k: remove_attributes(v) for k, v in obj.items() if k != "attributes"}
+    elif isinstance(obj, list):
+        return [remove_attributes(item) for item in obj]
+    else:
+        return obj
+
+
+def records_to_html_table(
+    records: List[Dict[str, Any]], headers: Dict[str, str] = None, styled: bool = False
+) -> str:
+    if not isinstance(records, list):
+        raise ValueError("records must be a list of dictionaries")
+
+    cleaned = remove_attributes(records)
+
+    flat_rows = []
+    for record in cleaned:
         if not isinstance(record, dict):
             raise ValueError(f"Record is not a dictionary: {record!r}")
-        record.pop("attributes", None)
-        normalized_records.append(record)
-    return dicts_to_html_table(normalized_records, styled=styled)
+        flat_rows.append(flatten_dict(record))
+
+    # Preserve column order across all rows
+    seen = set()
+    ordered_columns = []
+    for row in flat_rows:
+        for key in row.keys():
+            if key not in seen:
+                ordered_columns.append(key)
+                seen.add(key)
+
+    # headers optionally remaps flattened field names to user-friendly display names
+    if headers is None:
+        headers = {}
+        for col in ordered_columns:
+            headers[col] = col
+    else:
+        for col in ordered_columns:
+            headers[col] = headers.get(col, col)
+
+    # Normalize rows so all have the same keys, using remapped column names
+    normalized_data = []
+    for row in flat_rows:
+        normalized_row = {
+            headers.get(col, col): (
+                "" if row.get(col, None) is None else row.get(col, "")
+            )
+            for col in ordered_columns
+        }
+        normalized_data.append(normalized_row)
+
+    return dicts_to_html_table(normalized_data, styled=styled)

{sfq-0.0.36.dist-info → sfq-0.0.38.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: sfq
-Version: 0.0.36
+Version: 0.0.38
 Summary: Python wrapper for the Salesforce's Query API.
 Author-email: David Moruzzi <sfq.pypi@dmoruzi.com>
 Keywords: salesforce,salesforce query

{sfq-0.0.36.dist-info → sfq-0.0.38.dist-info}/RECORD

@@ -1,14 +1,14 @@
-sfq/__init__.py,sha256=VlPphhQ59mVW-BmJHE_S5P4-v1czO-CSX9icraMUx3E,20465
+sfq/__init__.py,sha256=phetYqYrR6LapFwR8FrwPa9lxRAh4oYWlBLq6JFCgzQ,20522
 sfq/_cometd.py,sha256=QqdSGsms9uFm7vgmxgau7m2UuLHztK1yjN-BNjeo8xM,10381
 sfq/auth.py,sha256=bD7kEI5UpUAh0xpE2GzB7EatfLE0q-rqG7tOpqn_cQY,13985
 sfq/crud.py,sha256=fj4wPMt0DcrMKbMWQ9AUMsUNUWicsY93LP_3Q7lhmDU,20300
 sfq/debug_cleanup.py,sha256=e2_Hpigy3F7XsATOUXo8DZNmuEIL9SDD0tBlZIZeQLc,2638
 sfq/exceptions.py,sha256=HZctvGj1SGguca0oG6fqSmf3KDbq4v68FfQfqB-crpo,906
-sfq/http_client.py,sha256=7SWfnJxHZMNphPc-pd3DUzPDrJymPQ9znNMSALnFiHQ,11636
+sfq/http_client.py,sha256=k5BAASlx7j9zJedu_XkksrOcTMbYAapHIe45Kq2LhEY,11636
 sfq/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 sfq/query.py,sha256=AoagL8PMKUcpbPPTcHJPKhmUdDDPa0La4JLC0TUN_Yc,14586
 sfq/soap.py,sha256=FM4msP9ErrgLFaNOQy_kYVde8QFkT4yQu9TfMiZG0VA,7006
-sfq/utils.py,sha256=3RjloIAO0A2i8nkbPwB6m9nnKhMvXBSsqnnKFmY1cwY,10782
-sfq-0.0.36.dist-info/METADATA,sha256=_6EWxpLVyuecOv0St_dTygTIt8wXodqtgx3cfQnNKHc,6899
-sfq-0.0.36.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-sfq-0.0.36.dist-info/RECORD,,
+sfq/utils.py,sha256=d1vhpTa5innn5w23dnb_9el_giOXRCuRIaP6XUnaLfc,12387
+sfq-0.0.38.dist-info/METADATA,sha256=MSuTzdQws45q-pBGDJ-vA_3CDvhTt1B1-juRHx3sjEc,6899
+sfq-0.0.38.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+sfq-0.0.38.dist-info/RECORD,,