buildzr 0.0.19__py3-none-any.whl → 0.0.20__py3-none-any.whl

buildzr/__about__.py

@@ -1 +1 @@
-VERSION = "0.0.19"
+VERSION = "0.0.20"

buildzr/dsl/dsl.py

@@ -842,6 +842,10 @@ class DeploymentEnvironment(DslDeploymentEnvironment):
         new relationship between those software system instances.
 
         These implied relationships are used in `DeploymentView`.
+
+        Relationships are only created between instances that share at least
+        one common deployment group. If no deployment groups are specified,
+        instances are considered to be in the same default group.
         """
 
         software_instances = [
@@ -889,6 +893,13 @@ class DeploymentEnvironment(DslDeploymentEnvironment):
                 for this_software_instance in this_software_instances:
                     for other_software_instance in other_software_instances:
 
+                        # Only create relationship if instances share a deployment group
+                        if not self._instances_share_deployment_group(
+                            this_software_instance,
+                            other_software_instance
+                        ):
+                            continue
+
                         already_exists = this_software_instance.model.relationships is not None and any(
                             r.sourceId == this_software_instance.model.id and
                             r.destinationId == other_software_instance.model.id and
@@ -906,6 +917,40 @@ class DeploymentEnvironment(DslDeploymentEnvironment):
                             )
                             r.model.linkedRelationshipId = relationship.id
 
+    def _instances_share_deployment_group(
+        self,
+        instance1: Union['ContainerInstance', 'SoftwareSystemInstance'],
+        instance2: Union['ContainerInstance', 'SoftwareSystemInstance']
+    ) -> bool:
+        """
+        Check if two deployment instances share at least one common deployment group.
+
+        If either instance has no deployment groups specified, they are considered
+        to be in the "default" group and can relate to all other instances without
+        deployment groups.
+
+        Args:
+            instance1: First deployment instance
+            instance2: Second deployment instance
+
+        Returns:
+            True if instances share at least one deployment group or if both have
+            no deployment groups specified, False otherwise.
+        """
+        groups1 = set(instance1.model.deploymentGroups or [])
+        groups2 = set(instance2.model.deploymentGroups or [])
+
+        # If both have no deployment groups, they can relate
+        if not groups1 and not groups2:
+            return True
+
+        # If one has groups and the other doesn't, they cannot relate
+        if (groups1 and not groups2) or (not groups1 and groups2):
+            return False
+
+        # Check if they share at least one common group
+        return bool(groups1.intersection(groups2))
+
     def _imply_container_instance_relationships(self, workspace: Workspace) -> None:
 
         """
@@ -915,6 +960,10 @@ class DeploymentEnvironment(DslDeploymentEnvironment):
         between those container instances.
 
         These implied relationships are used in `DeploymentView`.
+
+        Relationships are only created between instances that share at least
+        one common deployment group. If no deployment groups are specified,
+        instances are considered to be in the same default group.
         """
 
         from buildzr.dsl.expression import Expression
@@ -963,6 +1012,13 @@ class DeploymentEnvironment(DslDeploymentEnvironment):
                 for this_container_instance in this_container_instances:
                     for other_container_instance in other_container_instances:
 
+                        # Only create relationship if instances share a deployment group
+                        if not self._instances_share_deployment_group(
+                            this_container_instance,
+                            other_container_instance
+                        ):
+                            continue
+
                         already_exists = this_container_instance.model.relationships is not None and any(
                             r.sourceId == this_container_instance.model.id and
                             r.destinationId == other_container_instance.model.id and

{buildzr-0.0.19.dist-info → buildzr-0.0.20.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: buildzr
-Version: 0.0.19
+Version: 0.0.20
 Summary: Structurizr for the `buildzr`s 🧱⚒️
 Project-URL: homepage, https://github.com/amirulmenjeni/buildzr
 Project-URL: issues, https://github.com/amirulmenjeni/buildzr/issues

{buildzr-0.0.19.dist-info → buildzr-0.0.20.dist-info}/RECORD

@@ -1,8 +1,8 @@
-buildzr/__about__.py,sha256=aMHUW8D8Fq0eyBBQcpY6OmdN1KpA2z9MDEG8mxBR4uU,19
+buildzr/__about__.py,sha256=3JVoTwSM4MKD3-jf3WLeZSwhgAFSJco2QrGtDy-ehEI,19
 buildzr/__init__.py,sha256=hY-cOdjBQcz0v2m8cBF1oEJFIbcR3sWI-xww--0RKSo,99
 buildzr/dsl/__init__.py,sha256=qJ41IXcabKUjvwMzgfUCFdmDnSBBK7VFADpoVdOYLKQ,538
 buildzr/dsl/color.py,sha256=at5lo3WgLEDCjrnbu37ra1p1TjzdB51sxeW7pBMC_7U,4019
-buildzr/dsl/dsl.py,sha256=LvZbv33z_ZDru2Otf6vFwQrdEAaeGm670R0cnyUqJk8,86512
+buildzr/dsl/dsl.py,sha256=Z0QZ-uNtP6GIYytgOkIHfiqn4At59lmtUsHplOaYZgQ,88930
 buildzr/dsl/explorer.py,sha256=m1nI0Rd0bXGj1uXDgTC4DJhc2FMma522IepPNvQF07E,1853
 buildzr/dsl/expression.py,sha256=TLSe-uGlHhNqMPQU_5IRLIP-ZGsQ_ts3DquBMcYlwBg,11777
 buildzr/dsl/relations.py,sha256=GBs5epr9uuExU_H6VcP4XY76iJPQ__rz_d8tZlhhWQ4,11891
@@ -18,7 +18,7 @@ buildzr/models/models.py,sha256=NJOFYiRQ2i_1gP2ajPNpEfVLAz-1iCqqt1gPOHDPIks,4258
 buildzr/sinks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 buildzr/sinks/interfaces.py,sha256=LOZekP4WNjomD5J5f3FnZTwGj0aXMr6RbrvyFV5zn0E,383
 buildzr/sinks/json_sink.py,sha256=w_16ulQl2s-J-Yokp6GvDhAhuqN8XggXyEHCUNETLu4,865
-buildzr-0.0.19.dist-info/METADATA,sha256=7Ty1qRdPRm-JhLe8gyqR-lRF2rJPDxiRh3b3J6eRpYU,6596
-buildzr-0.0.19.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-buildzr-0.0.19.dist-info/licenses/LICENSE.md,sha256=e8e6W6tL4MbBY-c-gXMgDbaMf_BnaQDQv4Yoy42b-CI,1070
-buildzr-0.0.19.dist-info/RECORD,,
+buildzr-0.0.20.dist-info/METADATA,sha256=hFxv7edVPOOPQlm14LUSbn_FkibpFAk1U1j7eR1wSw0,6596
+buildzr-0.0.20.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+buildzr-0.0.20.dist-info/licenses/LICENSE.md,sha256=e8e6W6tL4MbBY-c-gXMgDbaMf_BnaQDQv4Yoy42b-CI,1070
+buildzr-0.0.20.dist-info/RECORD,,