PyPI - polylith-cli - Versions diffs - 1.44.0__tar.gz → 1.45.1__tar.gz - Mend

@@ -3,6 +3,7 @@ from polylith_cli.polylith.interface.collect import get_brick_interface
 from polylith_cli.polylith.interface.usage import check_brick_interface_usage, unified_usages
 from polylith_cli.polylith.reporting import theme
 from rich.console import Console
+from rich.padding import Padding
 from rich.table import Table
 def print_brick_interface(root: Path, ns: str, brick: str, bricks: dict) -> None:
@@ -17,7 +18,7 @@ def print_brick_interface(root: Path, ns: str, brick: str, bricks: dict) -> None
     for endpoint in sorted(brick_interface):
         *_ns, exposes = str.split(endpoint, '.')
         table.add_row(f'[data]{exposes}[/]')
-    console.print(table, overflow='ellipsis')
+    console.print(Padding(table, (0, 0, 1, 0)), overflow='ellipsis')
 def print_brick_interface_invalid_usage(root: Path, ns: str, brick: str, bricks: dict) -> None:
     res = check_brick_interface_usage(root, ns, brick, bricks)
@@ -25,7 +26,6 @@ def print_brick_interface_invalid_usage(root: Path, ns: str, brick: str, bricks:
     if not invalid_usage:
         return
     console = Console(theme=theme.poly_theme)
-    table = Table(box=None)
     tag = 'base' if brick in bricks['bases'] else 'comp'
     for using_brick, usages in invalid_usage.items():
         using_tag = 'base' if using_brick in bricks['bases'] else 'comp'
@@ -34,5 +34,4 @@ def print_brick_interface_invalid_usage(root: Path, ns: str, brick: str, bricks:
             prefix = f'Found in [{using_tag}]{using_brick}[/]'
             middle = f'[data]{used}[/] is not part of the public interface of [{tag}]{brick}[/]'
             message = f':information: {prefix}: {middle}.'
-            table.add_row(f'{message}')
-    console.print(table, overflow='ellipsis')
+            console.print(Padding(f'{message}', (0, 0, 0, 1)), overflow='ellipsis')

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: polylith-cli
-Version: 1.44.0
+Version: 1.45.1
 Summary: Python tooling support for the Polylith Architecture
 License: MIT
 Author: David Vujic

@@ -27,6 +27,13 @@ def used_by_as_bricks(bricks: dict, brick_deps: dict) -> dict:
     used_by = brick_deps['used_by']
     return {'bases': {b for b in used_by if b in bases}, 'components': {b for b in used_by if b in components}}
+def print_possible_invalid_bricks_interfaces_usage(root: Path, ns: str, bricks: dict, bricks_deps: dict) -> None:
+    flattened_bricks = set().union(*bricks.values())
+    bricks_with_deps = {b: bricks_deps[b] for b in flattened_bricks if b in bricks_deps}
+    for brick, brick_deps in bricks_with_deps.items():
+        used_bricks = used_by_as_bricks(bricks, brick_deps)
+        interface.report.print_brick_interface_invalid_usage(root, ns, brick, used_bricks)
 def run(root: Path, ns: str, options: dict):
     directory = options.get('directory')
     brick = options.get('brick')
@@ -49,4 +56,6 @@ def run(root: Path, ns: str, options: dict):
             deps.print_brick_with_circular_deps(brick, circular_deps, bricks)
         return
     deps.print_deps(bricks, imports, options)
+    if show_interface:
+        print_possible_invalid_bricks_interfaces_usage(root, ns, bricks, bricks_deps)
     deps.print_bricks_with_circular_deps(circular_bricks, bricks)

@@ -98,7 +98,7 @@ def print_brick_deps(brick: str, bricks: dict, brick_deps: dict, options: dict):
     if save:
         output.save(table, options, f'deps_{brick}')
-def print_brick_with_circular_deps(brick: str, deps: Set[str], bricks: dict) -> None:
+def print_brick_with_circular_deps(brick: str, deps: Set[str], bricks: dict, padding: Union[tuple, None]=None) -> None:
     bases = bricks['bases']
     console = Console(theme=theme.poly_theme)
     tag = calculate_tag(brick, bases)
@@ -106,8 +106,11 @@ def print_brick_with_circular_deps(brick: str, deps: Set[str], bricks: dict) ->
     others = '[data],[/] '.join(with_tags)
     prefix = ':information:'
     message = f'[{tag}]{brick}[/] [data]is used by[/] {others} [data]and also uses[/] {others}[data].[/]'
-    console.print(Padding(f'{prefix} {message}', (0, 0, 0, 1)), overflow='ellipsis')
+    pad = padding or (1, 0, 0, 1)
+    console.print(Padding(f'{prefix} {message}', pad), overflow='ellipsis')
 def print_bricks_with_circular_deps(circular_bricks: dict, bricks: dict) -> None:
+    console = Console(theme=theme.poly_theme)
+    console.print()
     for brick, deps in circular_bricks.items():
-        print_brick_with_circular_deps(brick, deps, bricks)
+        print_brick_with_circular_deps(brick, deps, bricks, (0, 0, 0, 1))

@@ -32,12 +32,7 @@ def generate_updated_pep_621_project(data: TOMLDocument, bricks_to_add: dict) ->
         copy['tool']['polylith']['bricks'][k] = v
     return tomlkit.dumps(copy)
-def generate_updated_pdm_project(data: TOMLDocument, packages: List[dict]) -> str:
-    bricks_to_add: dict = reduce(to_key_value_include, packages, {})
-    return generate_updated_pep_621_project(data, bricks_to_add)
-def generate_updated_hatch_project(data: TOMLDocument, packages: List[dict]) -> str:
-    bricks_to_add: dict = reduce(to_key_value_include, packages, {})
+def generate_updated_hatch_project(data: TOMLDocument, bricks_to_add: dict) -> str:
     has_polylith = data.get('tool', {}).get('polylith', {}).get('bricks')
     has_hatch = data.get('tool', {}).get('hatch', {}).get('build', {}).get('force-include')
     if not has_polylith and has_hatch:
@@ -59,10 +54,11 @@ def generate_updated_poetry_project(data: TOMLDocument, packages: List[dict]) ->
 def generate_updated_project(data: TOMLDocument, packages: List[dict]) -> Union[str, None]:
     if repo.is_poetry(data):
         return generate_updated_poetry_project(data, packages)
+    bricks_to_add: dict = reduce(to_key_value_include, packages, {})
     if repo.is_hatch(data):
-        return generate_updated_hatch_project(data, packages)
-    if repo.is_pdm(data):
-        return generate_updated_pdm_project(data, packages)
+        return generate_updated_hatch_project(data, bricks_to_add)
+    if repo.is_pep_621_ready(data):
+        return generate_updated_pep_621_project(data, bricks_to_add)
     return None
 def to_packages(root: Path, namespace: str, diff: dict) -> List[dict]:

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

polylith-cli 1.44.0__tar.gz → 1.45.1__tar.gz

polylith-cli 1.44.0tar.gz → 1.45.1tar.gz