fix(poly check, poly libs): extract imports with similar top namespaces (#432)

* fix(poly check, poly libs): extract brick imports, and separate bricks from third-party libs with similar top namespace

* bump Poetry plugin to 1.49.1

* bump CLI to 1.43.1

Author: DavidVujic

components/polylith/imports/grouping.py

@@ -2,7 +2,7 @@
 
 
 def only_brick_imports(imports: Set[str], top_ns: str) -> Set[str]:
-    return {i for i in imports if i.startswith(top_ns)}
+    return {i for i in imports if i == top_ns or i.startswith(f"{top_ns}.")}
 
 
 def only_bricks(import_data: dict, top_ns: str) -> dict:
@@ -29,7 +29,7 @@ def exclude_empty(import_data: dict) -> dict:
     return {k: v for k, v in import_data.items() if v}
 
 
-def extract_brick_imports(all_imports: dict, top_ns) -> dict:
+def extract_brick_imports(all_imports: dict, top_ns: str) -> dict:
     with_only_bricks = only_bricks(all_imports, top_ns)
     with_only_brick_names = only_brick_names(with_only_bricks)
 

projects/poetry_polylith_plugin/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "poetry-polylith-plugin"
-version = "1.49.0"
+version = "1.49.1"
 description = "A Poetry plugin that adds tooling support for the Polylith Architecture"
 authors = ["David Vujic"]
 homepage = "https://davidvujic.github.io/python-polylith-docs/"

projects/polylith_cli/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "polylith-cli"
-version = "1.43.0"
+version = "1.43.1"
 description = "Python tooling support for the Polylith Architecture"
 authors = ['David Vujic']
 homepage = "https://davidvujic.github.io/python-polylith-docs/"

test/components/polylith/imports/test_grouping.py

@@ -0,0 +1,57 @@
+from polylith.imports import (
+    extract_brick_imports,
+    extract_brick_imports_with_namespaces,
+)
+
+top_ns = "my_ns"
+
+all_imports = {
+    "brick_a": {"hello.world", f"{top_ns}.first", "typing.Set"},
+    "brick_b": {"httpx.Request"},
+    "brick_c": {f"{top_ns}.second"},
+    "brick_d": {top_ns},
+}
+
+
+def test_extract_brick_imports() -> None:
+    res = extract_brick_imports(all_imports, top_ns)
+
+    assert res == {
+        "brick_a": {"first"},
+        "brick_c": {"second"},
+    }
+
+
+def test_extract_brick_imports_when_third_party_starts_with_top_ns() -> None:
+    extra = {"brick_x": {f"{top_ns}_something_else.Request"}}
+
+    combined = {**all_imports, **extra}
+    res = extract_brick_imports(combined, top_ns)
+
+    assert res == {
+        "brick_a": {"first"},
+        "brick_c": {"second"},
+    }
+
+
+def test_extract_brick_imports_with_ns() -> None:
+    res = extract_brick_imports_with_namespaces(all_imports, top_ns)
+
+    assert res == {
+        "brick_a": {f"{top_ns}.first"},
+        "brick_c": {f"{top_ns}.second"},
+        "brick_d": {top_ns},
+    }
+
+
+def test_extract_brick_imports_with_ns_when_third_party_starts_with_top_ns() -> None:
+    extra = {"brick_x": {f"{top_ns}_something_else.Request"}}
+
+    combined = {**all_imports, **extra}
+    res = extract_brick_imports_with_namespaces(combined, top_ns)
+
+    assert res == {
+        "brick_a": {f"{top_ns}.first"},
+        "brick_c": {f"{top_ns}.second"},
+        "brick_d": {top_ns},
+    }