Merge branch 'release/v0.2.5'

Author: speedcell4

aku/aku.py

@@ -130,57 +130,56 @@ def run(self, namespace: Namespace = None):
         if isinstance(namespace, Namespace):
             namespace = namespace.__dict__
 
-        curry, literal = {}, {}
+        partial, literal = {}, {}
         for key, value in namespace.items():
 
-            curry_co = curry
+            partial_co = partial
             literal_co = literal
             *names, key = key.split('.')
             for name in names:
-                curry_co = curry_co.setdefault(name, {})
+                partial_co = partial_co.setdefault(name, {})
                 literal_co = literal_co.setdefault(name, {})
             if key == AKU_FN:
-                curry_co[key], literal_co[key] = value
+                partial_co[key], literal_co[key] = value
             else:
-                curry_co[key] = literal_co[key] = value
+                partial_co[key] = literal_co[key] = value
 
-        def recur_curry(item):
+        def recur_partial(item):
             if isinstance(item, dict):
                 if AKU_FN in item:
                     func = item.pop(AKU_FN)
-                    kwargs = {k: recur_curry(v) for k, v in item.items()}
+                    kwargs = {k: recur_partial(v) for k, v in item.items()}
                     return functools.partial(func, **kwargs)
                 else:
-                    return {k: recur_curry(v) for k, v in item.items()}
+                    return {k: recur_partial(v) for k, v in item.items()}
             else:
                 return item
 
-        def abbreviate_literal(item):
+        def recur_literal(item):
             out, keys, values = {}, [], []
 
-            def recur(prefixes, k, v):
+            def recur(prefixes, domain, v):
                 nonlocal keys, values
 
                 if isinstance(v, dict):
                     for x, y in v.items():
                         if x == AKU_FN:
-                            out['-'.join(prefixes[1:] + (k,))] = y
-                        elif k.endswith('_'):
-                            recur(prefixes + (k[:-1],), x, y)
+                            out['-'.join((*prefixes[1:], domain.removesuffix('_')))] = y
+                        elif domain.endswith('_'):
+                            recur(prefixes + (domain.removesuffix('_'),), x, y)
                         else:
                             recur(prefixes, x, y)
                 else:
-                    out['-'.join(prefixes[1:] + (k,))] = v
+                    out['-'.join(prefixes + (domain,))] = v
 
             recur((), '', item)
             return out
 
-        curry = recur_curry(curry)
-        literal = abbreviate_literal(literal)
+        partial = recur_partial(partial)
 
-        assert len(curry) == 1
-        for _, fn in curry.items():
+        assert len(partial) == 1
+        for _, fn in partial.items():
             if inspect.getfullargspec(fn).varkw is None:
                 return fn()
             else:
-                return fn(**{AKU: literal})
+                return fn(**{AKU: recur_literal(literal)})

cliff.toml

@@ -0,0 +1,66 @@
+# configuration file for git-cliff (0.1.0)
+
+[changelog]
+# changelog header
+header = """
+# Changelog\n
+All notable changes to this project will be documented in this file.\n
+"""
+# template for the changelog body
+# https://tera.netlify.app/docs/#introduction
+body = """
+{% if version %}\
+    ## [{{ version | trim_start_matches(pat="v") }}] - {{ timestamp | date(format="%Y-%m-%d") }}
+{% else %}\
+    ## [unreleased]
+{% endif %}\
+{% for group, commits in commits | group_by(attribute="group") %}
+    ### {{ group | upper_first }}
+    {% for commit in commits %}
+        - {% if commit.breaking %}[**breaking**] {% endif %}{{ commit.message | upper_first }}\
+    {% endfor %}
+{% endfor %}\n
+"""
+# remove the leading and trailing whitespace from the template
+trim = true
+# changelog footer
+footer = """
+<!-- generated by git-cliff -->
+"""
+
+[git]
+# parse the commits based on https://www.conventionalcommits.org
+conventional_commits = true
+# filter out the commits that are not conventional
+filter_unconventional = true
+# process each line of a commit as an individual commit
+split_commits = false
+# regex for preprocessing the commit messages
+commit_preprocessors = [
+    { pattern = '\((\w+\s)?#([0-9]+)\)', replace = "([#${2}](https://github.com/orhun/git-cliff/issues/${2}))"},
+]
+# regex for parsing and grouping commits
+commit_parsers = [
+    { message = "^feat", group = "Features"},
+    { message = "^fix", group = "Bug Fixes"},
+    { message = "^doc", group = "Documentation"},
+    { message = "^perf", group = "Performance"},
+    { message = "^refactor", group = "Refactor"},
+    { message = "^style", group = "Styling"},
+    { message = "^test", group = "Testing"},
+    { message = "^chore\\(release\\): prepare for", skip = true},
+    { message = "^chore", group = "Miscellaneous Tasks"},
+    { body = ".*security", group = "Security"},
+]
+# filter out the commits that are not matched by commit parsers
+filter_commits = false
+# glob pattern for matching git tags
+tag_pattern = "v[0-9]*"
+# regex for skipping tags
+skip_tags = "v0.1.0-beta.1"
+# regex for ignoring tags
+ignore_tags = ""
+# sort the tags chronologically
+date_order = false
+# sort the commits inside sections by oldest/newest order
+sort_commits = "oldest"

examples/reduplicated.py

@@ -0,0 +1,29 @@
+from typing import Type
+
+from aku import Aku
+
+app = Aku()
+
+
+def foo(name: str = 'first'):
+    print(f'{foo.__name__}.name => {name}')
+
+
+def bar(name: str = 'second'):
+    print(f'{bar.__name__}.name => {name}')
+
+
+def baz(name: str = 'third'):
+    print(f'{baz.__name__}.name => {name}')
+
+
+@app.option
+def reduplicated(fn1_: Type[foo] = foo, fn2_: Type[bar] = bar, fn3: Type[baz] = baz, **kwargs):
+    print(kwargs['@aku'])
+    fn1_()
+    fn2_()
+    fn3()
+
+
+if __name__ == '__main__':
+    app.run()

setup.py

@@ -5,7 +5,7 @@
 setup(
     name=name,
     description='An interactive annotation-driven ArgumentParser generator',
-    version='0.2.4',
+    version='0.2.5',
     packages=[package for package in find_packages() if package.startswith(name)],
     url='https://github.com/speedcell4/aku',
     license='MIT',

tests/assertion.py

@@ -0,0 +1,24 @@
+def assert_equal(actual, excepted):
+    if isinstance(excepted, list):
+        assert isinstance(actual, list)
+        for a, e in zip(actual, excepted):
+            assert_equal(a, e)
+
+    elif isinstance(excepted, tuple):
+        assert isinstance(actual, tuple)
+        for a, e in zip(actual, excepted):
+            assert_equal(a, e)
+
+    elif isinstance(excepted, (set, frozenset)):
+        assert isinstance(actual, (set, frozenset))
+        assert frozenset(actual) == frozenset(excepted), f'{frozenset(actual)} != {frozenset(excepted)}'
+
+    elif isinstance(excepted, dict):
+        assert isinstance(actual, dict)
+        assert_equal(actual=frozenset(actual.keys()), excepted=frozenset(excepted.keys()))
+
+        for key in excepted.keys():
+            assert_equal(actual=actual[key], excepted=excepted[key])
+
+    else:
+        assert actual == excepted, f'{actual} != {excepted}'