easyvista-python-client 0.4.0__py3-none-any.whl → 0.4.2__py3-none-any.whl

easyvista_python_client/_version.py

@@ -5,4 +5,4 @@
 live only in ``__init__``.
 """
 
-__version__ = "0.4.0"
+__version__ = "0.4.2"

easyvista_python_client/content/conversion.py

@@ -26,9 +26,10 @@ page lists them too. The glue below covers what the three libraries leave
 out: plain text, line breaks a browser does not show, bold and italic
 CommonMark would not close, link targets, and an mdformat set up without
 its nesting cap and with its quadratic lookups made linear. A body nested
-too deeply for the stack is read as its text (:func:`_text_of`); anything
-else that fails raises
-:class:`~easyvista_python_client.EasyvistaContentError`.
+too deeply for the stack, or on which the conversion raises ``ValueError``
+-- markdownify does for a ``colspan`` or ``start`` it cannot read as a
+number -- is read as its text (:func:`_text_of`); anything else that fails
+raises :class:`~easyvista_python_client.EasyvistaContentError`.
 
 A memo with no HTML element in it is read as literal lines, a line break
 per line. How EasyVista's web UI displays such a memo is unverified: the
@@ -138,6 +139,11 @@ _EMPHASIS = frozenset({"b", "strong", "em", "i"})
 _BEFORE, _AFTER = "data-ev-before", "data-ev-after"
 _NUMBER = "data-ev-number"  # an ordered item's number (_Converter.convert_li)
 
+#: The elements kept as raw tags (:meth:`_Converter.convert_u`), and the
+#: attribute marking one that holds a block (:func:`_note_blocks`).
+_RAW_INLINE = frozenset({"u", "mark", "ins"})
+_HOLDS_BLOCK = "data-ev-block"
+
 #: Text split into leading line breaks and spaces, content, trailing ones.
 #: The content ends on its last character that is neither, found greedily:
 #: a lazy ``.*?`` rescanned the run after it at every step, quadratic.
@@ -330,6 +336,33 @@ def _note_sides(root: Tag) -> None:
         element[_AFTER] = " "
 
 
+def _note_blocks(root: Tag) -> None:
+    """Mark each ``<u>``, ``<mark>`` or ``<ins>`` that holds a block.
+
+    Markdown has no inline tag around blocks: such a tag wrapped round them
+    showed a table, a list or a heading as its Markdown source, and round a
+    ``<pre>`` left a fence open to the end of the body. One walk: a block
+    marks the open ones from the innermost out and stops at one already
+    marked, whose holders were marked with it, so each is marked once
+    however deeply they nest.
+    """
+
+    holders: list[Tag] = []
+    for node, entering in _walk(root):
+        if not isinstance(node, Tag):
+            continue
+        if node.name in _RAW_INLINE:
+            if entering:
+                holders.append(node)
+            else:
+                holders.pop()
+        elif entering and node.name in _BLOCKS:
+            for holder in reversed(holders):
+                if holder.has_attr(_HOLDS_BLOCK):
+                    break
+                holder[_HOLDS_BLOCK] = ""
+
+
 def _punctuation(char: str) -> bool:
     """Return whether CommonMark counts ``char`` as punctuation."""
 
@@ -426,8 +459,14 @@ class _Converter(MarkdownConverter):
     convert_strike = convert_s
 
     def convert_u(self, el: Tag, text: str, parent_tags: set[str]) -> str:
-        """Underlined or highlighted text: CommonMark has neither, so raw HTML."""
+        """Underlined or highlighted text: CommonMark has neither, so raw HTML.
 
+        Round a block the tag is dropped and the blocks kept, except on the
+        one line of a cell or a heading, where the blocks are inline text.
+        """
+
+        if el.has_attr(_HOLDS_BLOCK) and "_inline" not in parent_tags:
+            return text
         return self._markup(el, text, parent_tags, "", el.name)
 
     convert_mark = convert_ins = convert_u
@@ -705,15 +744,30 @@ def html_to_markdown(html: str) -> str:
     _flatten_nested_tables(soup)
     _drop_trailing_breaks(soup)
     _note_sides(soup)
+    _note_blocks(soup)
     return str(_FORMATTER.render(_CONVERTER.convert_soup(soup))).strip()
 
 
+#: A link as cmark-gfm writes one: an ``href``, an optional ``title``, nothing else.
+_RENDERED_LINK = re.compile(r'<a href="[^"]*"(?: title="[^"]*")?>')
+
+#: What EasyVista's own editor writes on a link: without it the memo view opens the
+#: link in place, inside EasyVista's window, rather than in a new one.
+_NEW_WINDOW = ' target="_blank" rel="noopener noreferrer"'
+
+
 def markdown_to_html(markdown: str) -> str:
-    """Render Markdown as HTML: CommonMark with GFM tables, through cmark-gfm."""
+    """Render Markdown as HTML: CommonMark with GFM tables, through cmark-gfm.
+
+    Every link opens in a new window, the way a link written in EasyVista's
+    editor does: ``target="_blank" rel="noopener noreferrer"`` is added to each
+    link cmark-gfm writes. Reading ignores both attributes.
+    """
 
     html: str = cmarkgfm.markdown_to_html_with_extensions(
         markdown, options=_RENDER_OPTIONS, extensions=["table"]
     )
+    html = _RENDERED_LINK.sub(lambda link: link.group(0)[:-1] + _NEW_WINDOW + ">", html)
     return html.strip()
 
 
@@ -762,8 +816,10 @@ class EasyvistaContentConverter:
         ------
         EasyvistaContentError
             The value could not be converted. A body nested too deeply for
-            the stack left is read as its text instead, so this is a
-            backstop.
+            the stack left, or on which the conversion raises
+            ``ValueError`` (a ``colspan`` or ``start`` markdownify cannot
+            read as a number, among others), is read as its text instead,
+            so this is a backstop.
         RecursionError
             Only when called from within a few frames of the recursion
             limit, where no stack is left even to report the failure as

{easyvista_python_client-0.4.0.dist-info → easyvista_python_client-0.4.2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.5
 Name: easyvista-python-client
-Version: 0.4.0
+Version: 0.4.2
 Summary: Typed Python client for the EasyVista Service Manager REST API
 Project-URL: Homepage, https://github.com/baraline/easyvista_python_client
 Project-URL: Documentation, https://easyvista-python-client.readthedocs.io/en/latest/

{easyvista_python_client-0.4.0.dist-info → easyvista_python_client-0.4.2.dist-info}/RECORD

@@ -2,7 +2,7 @@ easyvista_python_client/__init__.py,sha256=AkPNxN1iaQhprPYShcqCEx03b0d4qi6b98MCF
 easyvista_python_client/_fields.py,sha256=L-9niigMP6vAMLR1rhY0KpmY0Zo_FeTkROr3dYd_Qwo,2164
 easyvista_python_client/_html.py,sha256=KftxdX4vHptQrOMqfWM-9I3g03UAA5YRmqwnLjI2Ir4,1276
 easyvista_python_client/_transport.py,sha256=AZItqLNOfgj1qTfC0ajxiKOPxXGnh7S0mGJE7VilfLU,3034
-easyvista_python_client/_version.py,sha256=PLASpND1O0wa5cbzoM9DAQcnNa0as2-w4-AiN1nIIzQ,290
+easyvista_python_client/_version.py,sha256=Qs1bD7HLZeviaRaWtnZfFdMaFFMcmAU9-o4uKWhIj2E,290
 easyvista_python_client/config.py,sha256=Zdzv2GB7Hma-z6RiR0820l4KPFn_EZxfmuQrS4RYlek,12361
 easyvista_python_client/context.py,sha256=_5PEjH4a2jM8Ks51YEes--CESt1vBXlK87y0s8UutHQ,13597
 easyvista_python_client/directory.py,sha256=BD44sgJgAAhcz2d0Eyqpv4fjdc9HCustI_izR4qwoyo,7820
@@ -25,7 +25,7 @@ easyvista_python_client/_sync/_concurrency.py,sha256=zeCtzdrMQa9thzdV6A5sdP8Ojoj
 easyvista_python_client/_sync/_transport.py,sha256=JwEclG90LO9wrPxv1aEy8sQxHbeWVyyi61oEy4zsHx8,27537
 easyvista_python_client/_sync/client.py,sha256=I7H999YpssGhGozMo7Dxu4qkkfTMKzJjAHvR8fEyyC8,117586
 easyvista_python_client/content/__init__.py,sha256=Bqf40LdL00OyOfq0IqR5uBSEBL1QKvVwll8u4dQ0lW0,878
-easyvista_python_client/content/conversion.py,sha256=H4FqOtU5ecKudlrCXe5gZsCb68NIK6sWs6YA8RwIz_I,32784
+easyvista_python_client/content/conversion.py,sha256=LFkNnKHJfsHEhcHwANYDMnKSX0Q9POan84lbxGiFj_M,35249
 easyvista_python_client/models/__init__.py,sha256=dCN1GPDWqu5zraEuGiCZaUGXyNQiK3yCuAC18Fh6NL4,47
 easyvista_python_client/models/action.py,sha256=m-R_n9S89yq3acjXsBM7FY05edW4jH97YIw5B-VG6zI,33405
 easyvista_python_client/models/asset.py,sha256=_cKeGOORSSLbqvXf_rQ2K00KM6K4DJdnqDvvhg7rhAg,2047
@@ -44,7 +44,7 @@ easyvista_python_client/resources/discovery.py,sha256=2XKV_sfP8Evlb_aDc4gi-aP-W3
 easyvista_python_client/resources/documents.py,sha256=FUfRDeAJu1qF9MvqLFwRtkxJvBC85SGEuoO85n_Qupk,6526
 easyvista_python_client/resources/employees.py,sha256=7X_hTRnk7T-GMNldDANmdnv2TgFZCfhIwgz7-PEDKaY,1790
 easyvista_python_client/resources/requests.py,sha256=qNksnO6RST6smHnT9eEkSbxR0iHXrW-ADkM3J_oQ4To,5380
-easyvista_python_client-0.4.0.dist-info/METADATA,sha256=Zpb6cKuhSROijleXwUYeNiaSnYuH_5UO6rCQP-9utP0,13094
-easyvista_python_client-0.4.0.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
-easyvista_python_client-0.4.0.dist-info/licenses/LICENSE,sha256=COAKFzPjsNCUJS82NnwBj20wPEHE34Dl8GzGZzaQWR0,1093
-easyvista_python_client-0.4.0.dist-info/RECORD,,
+easyvista_python_client-0.4.2.dist-info/METADATA,sha256=jwB2EAUsFzBnTfCbdZJjiT9-dulWiPS3R-PhgABBTDk,13094
+easyvista_python_client-0.4.2.dist-info/WHEEL,sha256=W3fkpkm7-wf9vBI5Z-7s0eWkeM-spu78I8Neb98DeEg,87
+easyvista_python_client-0.4.2.dist-info/licenses/LICENSE,sha256=COAKFzPjsNCUJS82NnwBj20wPEHE34Dl8GzGZzaQWR0,1093
+easyvista_python_client-0.4.2.dist-info/RECORD,,