fastcore 2.2.23__tar.gz → 2.2.24__tar.gz

{fastcore-2.2.23/fastcore.egg-info → fastcore-2.2.24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastcore
-Version: 2.2.23
+Version: 2.2.24
 Summary: Python supercharged for fastai development
 Author-email: Jeremy Howard and Sylvain Gugger <infos@fast.ai>
 License: Apache-2.0
@@ -84,6 +84,7 @@ To install fastcore run: `conda install fastcore -c fastai` (if you use Anaconda
 - `fastcore.test`: Simple testing functions
 - `fastcore.foundation`: Mixins, delegation, composition, and more
 - `fastcore.xtras`: Utility functions to help with functional-style programming, parallel processing, and more
+- `fastcore.xml`: HTML with [`ft`](https://fastcore.fast.ai/xml.html#ft), and case-preserving, namespace-aware XML with [`E`](https://fastcore.fast.ai/xml.html#e) factories
 
 To get started, we recommend you read through [the fastcore tour](https://fastcore.fast.ai/tour.html).
 

{fastcore-2.2.23 → fastcore-2.2.24}/README.md

@@ -53,6 +53,7 @@ To install fastcore run: `conda install fastcore -c fastai` (if you use Anaconda
 - `fastcore.test`: Simple testing functions
 - `fastcore.foundation`: Mixins, delegation, composition, and more
 - `fastcore.xtras`: Utility functions to help with functional-style programming, parallel processing, and more
+- `fastcore.xml`: HTML with [`ft`](https://fastcore.fast.ai/xml.html#ft), and case-preserving, namespace-aware XML with [`E`](https://fastcore.fast.ai/xml.html#e) factories
 
 To get started, we recommend you read through [the fastcore tour](https://fastcore.fast.ai/tour.html).
 

{fastcore-2.2.23 → fastcore-2.2.24}/fastcore/__init__.py

@@ -52,7 +52,7 @@ Modules:
 - `fastcore.test`: Helper functions to quickly write tests in notebooks
 - `fastcore.tools`: Text and file editing primitives shared by the fastai editing tools
 - `fastcore.xdg`: XDG Base Directory Specification helpers.
-- `fastcore.xml`: Concise generation of XML.
+- `fastcore.xml`: Concise HTML generation and namespace-aware XML construction.
 - `fastcore.xtras`: Utility functions used in the fastai library"""
 
-__version__ = "2.2.23"
+__version__ = "2.2.24"

{fastcore-2.2.23 → fastcore-2.2.24}/fastcore/_modidx.py

@@ -812,7 +812,12 @@ d = { 'settings': { 'branch': 'main',
                               'fastcore.xdg.xdg_data_home': ('xdg.html#xdg_data_home', 'fastcore/xdg.py'),
                               'fastcore.xdg.xdg_runtime_dir': ('xdg.html#xdg_runtime_dir', 'fastcore/xdg.py'),
                               'fastcore.xdg.xdg_state_home': ('xdg.html#xdg_state_home', 'fastcore/xdg.py')},
-            'fastcore.xml': { 'fastcore.xml.FT': ('xml.html#ft', 'fastcore/xml.py'),
+            'fastcore.xml': { 'fastcore.xml.E': ('xml.html#e', 'fastcore/xml.py'),
+                              'fastcore.xml.E.__call__': ('xml.html#e.__call__', 'fastcore/xml.py'),
+                              'fastcore.xml.E.__getattr__': ('xml.html#e.__getattr__', 'fastcore/xml.py'),
+                              'fastcore.xml.E.__init__': ('xml.html#e.__init__', 'fastcore/xml.py'),
+                              'fastcore.xml.E._namespace': ('xml.html#e._namespace', 'fastcore/xml.py'),
+                              'fastcore.xml.FT': ('xml.html#ft', 'fastcore/xml.py'),
                               'fastcore.xml.FT.__call__': ('xml.html#ft.__call__', 'fastcore/xml.py'),
                               'fastcore.xml.FT.__eq__': ('xml.html#ft.__eq__', 'fastcore/xml.py'),
                               'fastcore.xml.FT.__getattr__': ('xml.html#ft.__getattr__', 'fastcore/xml.py'),
@@ -833,6 +838,13 @@ d = { 'settings': { 'branch': 'main',
                               'fastcore.xml.Html': ('xml.html#html', 'fastcore/xml.py'),
                               'fastcore.xml.Safe': ('xml.html#safe', 'fastcore/xml.py'),
                               'fastcore.xml.Safe.__html__': ('xml.html#safe.__html__', 'fastcore/xml.py'),
+                              'fastcore.xml.XML': ('xml.html#xml', 'fastcore/xml.py'),
+                              'fastcore.xml.XML.__init__': ('xml.html#xml.__init__', 'fastcore/xml.py'),
+                              'fastcore.xml.XML.__str__': ('xml.html#xml.__str__', 'fastcore/xml.py'),
+                              'fastcore.xml.XML._child': ('xml.html#xml._child', 'fastcore/xml.py'),
+                              'fastcore.xml.XML._render': ('xml.html#xml._render', 'fastcore/xml.py'),
+                              'fastcore.xml.XML._repr_markdown_': ('xml.html#xml._repr_markdown_', 'fastcore/xml.py'),
+                              'fastcore.xml.XML.bytes': ('xml.html#xml.bytes', 'fastcore/xml.py'),
                               'fastcore.xml._attr2tag': ('xml.html#_attr2tag', 'fastcore/xml.py'),
                               'fastcore.xml._escape': ('xml.html#_escape', 'fastcore/xml.py'),
                               'fastcore.xml._fix_k': ('xml.html#_fix_k', 'fastcore/xml.py'),
@@ -841,6 +853,11 @@ d = { 'settings': { 'branch': 'main',
                               'fastcore.xml._preproc': ('xml.html#_preproc', 'fastcore/xml.py'),
                               'fastcore.xml._to_attr': ('xml.html#_to_attr', 'fastcore/xml.py'),
                               'fastcore.xml._to_xml': ('xml.html#_to_xml', 'fastcore/xml.py'),
+                              'fastcore.xml._xml_flatten': ('xml.html#_xml_flatten', 'fastcore/xml.py'),
+                              'fastcore.xml._xml_keyword': ('xml.html#_xml_keyword', 'fastcore/xml.py'),
+                              'fastcore.xml._xml_name': ('xml.html#_xml_name', 'fastcore/xml.py'),
+                              'fastcore.xml._xml_qualify': ('xml.html#_xml_qualify', 'fastcore/xml.py'),
+                              'fastcore.xml._xml_value': ('xml.html#_xml_value', 'fastcore/xml.py'),
                               'fastcore.xml.attrmap': ('xml.html#attrmap', 'fastcore/xml.py'),
                               'fastcore.xml.dict2xml': ('xml.html#dict2xml', 'fastcore/xml.py'),
                               'fastcore.xml.ft': ('xml.html#ft', 'fastcore/xml.py'),

{fastcore-2.2.23 → fastcore-2.2.24}/fastcore/script.py

@@ -69,6 +69,8 @@ Union types such as `int|str` try each type in turn, and `enum` types such as th
 
 The decorated function is always the CLI entry point, and only the entry point gets `sys.argv`: argv is parsed when the function's file is run directly (`python foo.py`, `python -m foo`, or `%run foo.py`), or when it's called with no arguments from the top-level body of a directly-run file (which is how console script wrappers invoke it). Every other call is a plain Python call that ignores argv, whether from a notebook, the REPL, another function, or another `call_parse` function.
 
+CLI calls return only `int` values (including `bool`) for console script exit codes; other return values are discarded. Plain Python calls preserve the return value. To report an error message, raise `CliError` rather than returning a string.
+
 Use the `nested` keyword argument to create nested parsers, where earlier parsers consume only their known args from `sys.argv` before later parsers are used. This is useful to create one command line application that executes another. For example:
 
 ```sh
@@ -301,7 +303,8 @@ def _run_cli(func, nested, pos=None):
         pargs,args = _pos_split(func, merge(args, args_from_prog(func, xtra)))
         try:
             res = tfunc(*pargs, **args)
-            return asyncio.run(res) if inspect.isawaitable(res) else res
+            if inspect.isawaitable(res): res = asyncio.run(res)
+            return res if isinstance(res, int) else None
         except CliError as e: raise SystemExit(str(e))
 
 def call_parse(func=None, nested=False, pos:list=None):

{fastcore-2.2.23 → fastcore-2.2.24}/fastcore/xml.py

@@ -1,4 +1,4 @@
-"""Concise generation of XML.
+"""Concise HTML generation and namespace-aware XML construction.
 
 `ft(tag, *children, **attrs)` builds an `FT` tree — a lightweight XML/HTML element — and `to_xml` renders it (this is the foundation [fasthtml](https://fastht.ml) builds on). The common HTML tags are predefined as `ft` partials (`Div`, `P`, `A`, ...). Attributes are passed as keywords: use `klass` and `fr` for the reserved words `class` and `for`, `_` in an attr name becomes `-`, and attrs can be got and set on the object directly. Children can also be supplied after the attrs by calling the element, e.g. `Div(id='x')(child1, child2)`:
 
@@ -8,16 +8,18 @@ test_eq(to_xml(t), '<div hx-get="/get">\n  <p class="a">hi</p>\n</div>\n')
 test_eq(to_xml(Div(id='x')('child')), '<div id="x">child</div>\n')
 ```
 
+`E(prefix='', attr_ns=None, ns=None)` creates a namespace-bound XML factory. `e = E('w', attr_ns='w', ns={'w': uri})` supports expressions such as `e.tcW(type='dxa', w=2400)`. Tags and attributes preserve case. `prefix__name` selects an attribute namespace; `attrs_` accepts literal names. Expressions compose with text and ordered collections, retain their namespace bindings, and serialize as UTF-8 with `.bytes()`. XML text is escaped and booleans become `true`/`false`. The existing `ft` and `to_xml` APIs keep their HTML behavior.
+
 Docs: https://fastcore.fast.ai/xml.html.md"""
 
 # AUTOGENERATED! DO NOT EDIT! File to edit: ../nbs/09_xml.ipynb.
 
 # %% auto #0
 __all__ = ['voids', 'attrmap', 'valmap', 'FT', 'ft', 'Html', 'Safe', 'to_xml', 'dict2xml', 'highlight', 'showtags', 'mk_getattr',
-           'Head', 'Title', 'Meta', 'Link', 'Style', 'Body', 'Pre', 'Code', 'Div', 'Span', 'P', 'H1', 'H2', 'H3', 'H4',
-           'H5', 'H6', 'Strong', 'Em', 'B', 'I', 'U', 'S', 'Strike', 'Sub', 'Sup', 'Hr', 'Br', 'Img', 'A', 'Nav', 'Ul',
-           'Ol', 'Li', 'Dl', 'Dt', 'Dd', 'Table', 'Thead', 'Tbody', 'Tfoot', 'Tr', 'Th', 'Td', 'Caption', 'Col',
-           'Colgroup', 'Form', 'Input', 'Textarea', 'Button', 'Select', 'Option', 'Label', 'Fieldset', 'Legend',
+           'XML', 'E', 'Head', 'Title', 'Meta', 'Link', 'Style', 'Body', 'Pre', 'Code', 'Div', 'Span', 'P', 'H1', 'H2',
+           'H3', 'H4', 'H5', 'H6', 'Strong', 'Em', 'B', 'I', 'U', 'S', 'Strike', 'Sub', 'Sup', 'Hr', 'Br', 'Img', 'A',
+           'Nav', 'Ul', 'Ol', 'Li', 'Dl', 'Dt', 'Dd', 'Table', 'Thead', 'Tbody', 'Tfoot', 'Tr', 'Th', 'Td', 'Caption',
+           'Col', 'Colgroup', 'Form', 'Input', 'Textarea', 'Button', 'Select', 'Option', 'Label', 'Fieldset', 'Legend',
            'Details', 'Summary', 'Main', 'Header', 'Footer', 'Section', 'Article', 'Aside', 'Figure', 'Figcaption',
            'Mark', 'Small', 'Iframe', 'Object', 'Embed', 'Param', 'Video', 'Audio', 'Source', 'Canvas', 'Svg', 'Math',
            'Script', 'Noscript', 'Template', 'Slot']
@@ -272,3 +274,136 @@ def mk_getattr(f):
     return _getattr
 
 __getattr__ = mk_getattr(ft)
+
+# %% ../nbs/09_xml.ipynb #d6b837e2
+from collections.abc import Iterator
+from keyword import iskeyword
+from xml.sax.saxutils import escape as xml_escape, quoteattr
+
+
+# %% ../nbs/09_xml.ipynb #8cb06993
+_xml_uri = 'http://www.w3.org/XML/1998/namespace'
+_xmlns_uri = 'http://www.w3.org/2000/xmlns/'
+_xml_start = (r'A-Z_a-z\u00c0-\u00d6\u00d8-\u00f6\u00f8-\u02ff\u0370-\u037d\u037f-\u1fff'
+              r'\u200c-\u200d\u2070-\u218f\u2c00-\u2fef\u3001-\ud7ff\uf900-\ufdcf\ufdf0-\ufffd\U00010000-\U000effff')
+_xml_local = re.compile(fr'[{_xml_start}][{_xml_start}\-.0-9\u00b7\u0300-\u036f\u203f-\u2040]*')
+_xml_illegal = re.compile(r'[^\x09\x0a\x0d\x20-\ud7ff\ue000-\ufffd\U00010000-\U0010ffff]')
+
+# %% ../nbs/09_xml.ipynb #b1031eff
+def _xml_name(name):
+    parts = name.split(':')
+    if len(parts)>2 or any(not _xml_local.fullmatch(p) for p in parts): raise ValueError(f'Invalid XML name: {name!r}')
+    if parts[0]=='xmlns': raise ValueError('Use ns for namespace declarations')
+    return (parts[0], parts[1]) if len(parts)==2 else ('', name)
+
+def _xml_value(value):
+    value = ('true' if value else 'false') if isinstance(value, bool) else str(value)
+    if _xml_illegal.search(value): raise ValueError('Illegal XML character')
+    return value
+
+def _xml_flatten(children):
+    for child in children:
+        if isinstance(child, (list, tuple, L, Iterator)): yield from _xml_flatten(child)
+        elif child is not None: yield child
+
+def _xml_qualify(name, prefix): return name if ':' in name or not prefix else f'{prefix}:{name}'
+
+def _xml_keyword(name):
+    prefix, sep, local = name.partition('__')
+    if not sep: local = prefix
+    if local.endswith('_') and iskeyword(local[:-1]): local = local[:-1]
+    return f'{prefix}:{local}' if sep else local
+
+# %% ../nbs/09_xml.ipynb #4abe3b40
+class XML:
+    "A detached XML expression with fixed namespace bindings."
+    def __init__(self, tag, children, attrs, ns):
+        self.tag,self.attrs,self.ns = tag,attrs,ns
+        self.children = tuple(self._child(c) for c in _xml_flatten(children))
+
+    def _child(self, child):
+        if isinstance(child, XML): return child
+        if isinstance(child, str): return _xml_value(child)
+        raise TypeError('XML children require expressions, strings, or ordered collections of them')
+
+
+# %% ../nbs/09_xml.ipynb #642fc6f0
+@patch
+def _render(self:XML, inherited, output):
+    output.append(f'<{self.tag}')
+    for prefix, uri in self.ns.items():
+        if inherited.get(prefix) != uri:
+            name = f'xmlns:{prefix}' if prefix else 'xmlns'
+            output.append(f' {name}={quoteattr(uri)}')
+    for name, value in self.attrs: output.append(f' {name}={quoteattr(value)}')
+    if not self.children:
+        output.append('/>')
+        return
+    output.append('>')
+    context = {**inherited, **self.ns}
+    for child in self.children:
+        if isinstance(child, XML): child._render(context, output)
+        else: output.append(xml_escape(child, {'\r': '&#13;'}))
+    output.append(f'</{self.tag}>')
+
+@patch
+def __str__(self:XML):
+    output = []
+    self._render({'xml': _xml_uri}, output)
+    return ''.join(output)
+
+@patch
+def bytes(self:XML):
+    "Serialize as UTF-8, without formatting whitespace."
+    return str(self).encode('utf-8')
+
+@patch
+def _repr_markdown_(self:XML): return f'```xml\n{self}\n```'
+
+# %% ../nbs/09_xml.ipynb #335a7366
+class E:
+    "Create a namespace-bound XML factory."
+    _node_cls = XML
+
+    def __init__(
+        self, prefix='', # Default element prefix; empty uses the default namespace
+        *, attr_ns=None, # Default attribute prefix; None leaves attributes unqualified
+        ns=None, # Prefix-to-URI bindings, including prefixes used only in values
+    ):
+        self._prefix,self._attr_ns = prefix,attr_ns
+        self._ns = {'': '', 'xml': _xml_uri, **(ns or {})}
+        for p in (prefix, attr_ns):
+            if p and (not _xml_local.fullmatch(p) or p=='xmlns'): raise ValueError(f'Invalid XML prefix: {p!r}')
+        for p, uri in self._ns.items():
+            if p and not _xml_local.fullmatch(p): raise ValueError(f'Invalid XML prefix: {p!r}')
+            if not isinstance(p, str) or not isinstance(uri, str): raise TypeError('Namespace prefixes and URIs require strings')
+            _xml_value(uri)
+            if p=='xmlns' or uri==_xmlns_uri or (p=='xml')!=(uri==_xml_uri) or p and not uri:
+                raise ValueError('Invalid reserved or empty namespace binding')
+
+    def _namespace(self, prefix):
+        if prefix not in self._ns: raise ValueError(f'Unknown XML prefix: {prefix!r}; supply ns')
+        return self._ns[prefix]
+
+    def __getattr__(self, name):
+        if name.startswith('_'): raise AttributeError(name)
+        if name.endswith('_') and iskeyword(name[:-1]): name = name[:-1]
+        return partial(self, name)
+
+    def __call__(self, name, /, *children, attrs_=None, **attrs):
+        tag = _xml_qualify(name, self._prefix)
+        pairs = [(_xml_qualify(_xml_keyword(k), self._attr_ns), v) for k,v in attrs.items()]
+        pairs += list((attrs_ or {}).items())
+        ns,seen,values = dict(self._ns),set(),[]
+        prefix, _ = _xml_name(tag)
+        if prefix: ns[prefix] = self._namespace(prefix)
+        for key, value in pairs:
+            if value is None: continue
+            prefix, local = _xml_name(key)
+            if prefix: ns[prefix] = self._namespace(prefix)
+            expanded = (ns[prefix] if prefix else '', local)
+            if expanded in seen: raise ValueError(f'Duplicate XML attribute: {key!r}')
+            seen.add(expanded)
+            values.append((key, _xml_value(value)))
+        return self._node_cls(tag, children, tuple(values), ns)
+

{fastcore-2.2.23 → fastcore-2.2.24}/fastcore/xtras.py

@@ -326,22 +326,17 @@ def rsync_multi(ip, files, user='ubuntu', persist='5m'):
     for src,dst in files: shell(f'rsync -az -e "ssh -S {sock}" {src} {user}@{ip}:{dst}')
 
 # %% ../nbs/03_xtras.ipynb #dda52646
-def run(cmd, *rest, same_in_win=False, ignore_ex=False, as_bytes=False, stderr=True):
+def run(cmd, *rest, same_in_win=False, ignore_ex=False, as_bytes=False, stderr=True, inp=None):
     "Pass `cmd` (splitting with `shlex` if string) to `subprocess.run`; return `stdout`; raise `IOError` if fails"
-    # Even the command is same on Windows, we have to add `cmd /c `"
     import subprocess
-    if rest:
-        if sys.platform == 'win32' and same_in_win:
-            cmd = ('cmd', '/c', cmd, *rest)
-        else:
-            cmd = (cmd,)+rest
+    if rest: cmd = ('cmd', '/c', cmd, *rest) if sys.platform == 'win32' and same_in_win else (cmd,)+rest
     elif isinstance(cmd, str):
-        if sys.platform == 'win32' and same_in_win: cmd = 'cmd /c ' + cmd
         import shlex
+        if sys.platform == 'win32' and same_in_win: cmd = 'cmd /c ' + cmd
         cmd = shlex.split(cmd)
-    elif isinstance(cmd, list):
-        if sys.platform == 'win32' and same_in_win: cmd = ['cmd', '/c'] + cmd
-    res = subprocess.run(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    elif isinstance(cmd, list) and sys.platform == 'win32' and same_in_win: cmd = ['cmd', '/c'] + cmd
+    if isinstance(inp, str): inp = inp.encode()
+    res = subprocess.run(cmd, input=inp, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     stdout = res.stdout
     if stderr and res.stderr: stdout += b' ;; ' + res.stderr
     if not as_bytes: stdout = stdout.decode().strip()

{fastcore-2.2.23 → fastcore-2.2.24/fastcore.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastcore
-Version: 2.2.23
+Version: 2.2.24
 Summary: Python supercharged for fastai development
 Author-email: Jeremy Howard and Sylvain Gugger <infos@fast.ai>
 License: Apache-2.0
@@ -84,6 +84,7 @@ To install fastcore run: `conda install fastcore -c fastai` (if you use Anaconda
 - `fastcore.test`: Simple testing functions
 - `fastcore.foundation`: Mixins, delegation, composition, and more
 - `fastcore.xtras`: Utility functions to help with functional-style programming, parallel processing, and more
+- `fastcore.xml`: HTML with [`ft`](https://fastcore.fast.ai/xml.html#ft), and case-preserving, namespace-aware XML with [`E`](https://fastcore.fast.ai/xml.html#e) factories
 
 To get started, we recommend you read through [the fastcore tour](https://fastcore.fast.ai/tour.html).