fix(poly sync): sort by type and then alphabetically for Poetry projects (#458)

* fix(poly sync): sort by brick type and then alphabetically for Poetry packages

* bump CLI to 1.49.1

* bump Poetry plugin to 1.53.1

Author: DavidVujic

components/polylith/sync/update.py

@@ -81,10 +81,9 @@ def to_sorted_packages(packages: List[dict]) -> List[dict]:
     sorted_by_brick_type = sorted(packages, key=sort_fn_by_from)
     grouped = itertools.groupby(sorted_by_brick_type, key=sort_fn_by_from)
 
-    groups = [list(g) for _k, g in grouped]
-    flattened: List[dict] = reduce(operator.iadd, groups, [])
+    groups = [sorted(g, key=sort_fn_by_include) for _k, g in grouped]
 
-    return sorted(flattened, key=sort_fn_by_include)
+    return reduce(operator.iadd, groups, [])
 
 
 def generate_updated_poetry_project(data: TOMLDocument, packages: List[dict]) -> str:

projects/poetry_polylith_plugin/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "poetry-polylith-plugin"
-version = "1.53.0"
+version = "1.53.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.49.0"
+version = "1.49.1"
 description = "Python tooling support for the Polylith Architecture"
 authors = ['David Vujic']
 homepage = "https://davidvujic.github.io/python-polylith-docs/"

test/components/polylith/sync/test_update.py

@@ -78,16 +78,16 @@ def test_bricks_to_pyproject_packages():
 }
 
 unsorted_packages = [
-    {"include": "hello/c", "from": "components"},
-    {"include": "hello/a", "from": "bases"},
     {"include": "hello/b", "from": "components"},
+    {"include": "hello/x", "from": "bases"},
+    {"include": "hello/a", "from": "components"},
 ]
 
 expected_sorted_pep621_bricks = {
     "bases/hello/first": "hello/first",
-    "bases/hello/a": "hello/a",
+    "bases/hello/x": "hello/x",
+    "components/hello/a": "hello/a",
     "components/hello/b": "hello/b",
-    "components/hello/c": "hello/c",
 }
 
 poetry_project_data = """\
@@ -140,9 +140,9 @@ def test_generate_updated_poetry_project_with_the_bricks_to_update_sorted():
 
     expected = [
         {"include": "hello/first", "from": "bases"},
-        {"include": "hello/a", "from": "bases"},
+        {"include": "hello/x", "from": "bases"},
+        {"include": "hello/a", "from": "components"},
         {"include": "hello/b", "from": "components"},
-        {"include": "hello/c", "from": "components"},
     ]
 
     updated = update.generate_updated_project(data, unsorted_packages)