[cdd/shared/ast_utils.py] Resolve TODO from `deduplicate_sorted_impor…

…ts` to also deduplicate individual `ImportFrom`s ; [cdd/__init__.py] Bump version
offscale · Feb 13, 2024 · 64ebf80 · 64ebf80
1 parent 2e80ab1
commit 64ebf80
Show file tree

Hide file tree

Showing 2 changed files with 35 additions and 13 deletions.
diff --git a/cdd/__init__.py b/cdd/__init__.py
@@ -9,7 +9,7 @@
 from logging import getLogger as get_logger
 
 __author__ = "Samuel Marks"  # type: str
-__version__ = "0.0.99rc29"  # type: str
+__version__ = "0.0.99rc30"  # type: str
 __description__ = (
     "Open API to/fro routes, models, and tests. "
     "Convert between docstrings, classes, methods, argparse, pydantic, and SQLalchemy."

diff --git a/cdd/shared/ast_utils.py b/cdd/shared/ast_utils.py
@@ -2381,23 +2381,45 @@ def deduplicate_sorted_imports(module):
         ),
         None,
     )
+    name_seen = set()
 
     module.body = (
         module.body[:fst_import_idx]
         + [
-            # TODO: Infer `level` and deduplicate `names`
-            ImportFrom(
-                module=name,
-                names=sorted(
-                    chain.from_iterable(map(attrgetter("names"), import_from_nodes)),
-                    key=attrgetter("name"),
-                ),
-                level=0,  # import_from_nodes[0].level
-                identifier=None,
-            )
-            for name, import_from_nodes in groupby(
-                module.body[fst_import_idx:lst_import_idx], key=attrgetter("module")
+            import_from
+            for import_from in (
+                # TODO: Infer `level`
+                ImportFrom(
+                    module=name,
+                    names=list(
+                        filter(
+                            lambda _alias: (
+                                lambda key: (
+                                    False
+                                    if key in name_seen
+                                    else (name_seen.add(key) or True)
+                                )
+                            )(
+                                "<name={!r}, alias.name={!r}, alias.asname={!r}>".format(
+                                    name, _alias.name, _alias.asname
+                                )
+                            ),
+                            sorted(
+                                chain.from_iterable(
+                                    map(attrgetter("names"), import_from_nodes)
+                                ),
+                                key=attrgetter("name"),
+                            ),
+                        )
+                    ),
+                    level=0,  # import_from_nodes[0].level
+                    identifier=None,
+                )
+                for name, import_from_nodes in groupby(
+                    module.body[fst_import_idx:lst_import_idx], key=attrgetter("module")
+                )
             )
+            if import_from.names
         ]
         + module.body[lst_import_idx:]
     )