polylith-cli 1.42.5__tar.gz → 1.43.1__tar.gz

{polylith_cli-1.42.5 → polylith_cli-1.43.1}/PKG-INFO

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

{polylith_cli-1.42.5 → polylith_cli-1.43.1}/polylith_cli/polylith/bricks/brick.py

@@ -1,12 +1,25 @@
 from pathlib import Path
-from polylith_cli.polylith import configuration
+from polylith_cli.polylith import configuration, info
 from polylith_cli.polylith.dirs import create_dir
 from polylith_cli.polylith.files import create_file
 from polylith_cli.polylith.interface import create_interface
 from polylith_cli.polylith.readme import create_brick_readme
 
+def validate(root: Path, namespace: str, name: str) -> None:
+    bases = info.get_bases(root, namespace)
+    components = info.get_components(root, namespace)
+    if name in bases:
+        message = f'{name} already exists in bases.'
+        raise ValueError(message)
+    if name in components:
+        message = f'{name} already exists in components.'
+        raise ValueError(message)
+
 def create_brick(root: Path, options: dict) -> None:
     modulename = options['modulename']
+    package = options['package']
+    namespace = options['namespace']
+    validate(root, namespace, package)
     path_kwargs = {k: v for k, v in options.items() if k in {'brick', 'namespace', 'package'}}
     brick_structure = configuration.get_brick_structure_from_config(root)
     resources_structure = configuration.get_resources_structure_from_config(root)

{polylith_cli-1.42.5 → polylith_cli-1.43.1}/polylith_cli/polylith/cli/create.py

@@ -7,15 +7,22 @@ from typer import Exit, Option, Typer
 from typing_extensions import Annotated
 app = Typer()
 
+def _try_create(name: str, description: str, fn):
+    try:
+        create(name, description, fn)
+    except ValueError as e:
+        print(f'Did not create: {e}')
+        raise Exit(code=1)
+
 @app.command('base')
 def base_command(name: Annotated[str, Option(help='Name of the base.')], description: Annotated[str, Option(help='Description of the base.')]=''):
     """Creates a Polylith base."""
-    create(name, description, base.create_base)
+    _try_create(name, description, base.create_base)
 
 @app.command('component')
 def component_command(name: Annotated[str, Option(help='Name of the component.')], description: Annotated[str, Option(help='Description of the component.')]=''):
     """Creates a Polylith component."""
-    create(name, description, component.create_component)
+    _try_create(name, description, component.create_component)
 
 def _create_project(root: Path, options: dict):
     name = options['package']

{polylith_cli-1.42.5 → polylith_cli-1.43.1}/polylith_cli/polylith/imports/grouping.py

@@ -2,7 +2,7 @@ from typing import Set, Union
 
 
 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)
 

{polylith_cli-1.42.5 → polylith_cli-1.43.1}/pyproject.toml

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