buildzr 0.0.6__py3-none-any.whl → 0.0.7__py3-none-any.whl

buildzr/__about__.py

@@ -1 +1 @@
-VERSION = "0.0.6"
+VERSION = "0.0.7"

buildzr/dsl/dsl.py

@@ -199,7 +199,15 @@ class Workspace(DslWorkspaceElement):
     def __dir__(self) -> Iterable[str]:
         return list(super().__dir__()) + list(self._dynamic_attrs.keys())
 
-class SoftwareSystem(DslElementRelationOverrides):
+class SoftwareSystem(DslElementRelationOverrides[
+    'SoftwareSystem',
+    Union[
+        'Person',
+        'SoftwareSystem',
+        'Container',
+        'Component'
+    ]
+]):
     """
     A software system.
     """
@@ -284,7 +292,15 @@ class SoftwareSystem(DslElementRelationOverrides):
     def __dir__(self) -> Iterable[str]:
         return list(super().__dir__()) + list(self._dynamic_attrs.keys())
 
-class Person(DslElementRelationOverrides):
+class Person(DslElementRelationOverrides[
+    'Person',
+    Union[
+        'Person',
+        'SoftwareSystem',
+        'Container',
+        'Component'
+    ]
+]):
     """
     A person who uses a software system.
     """
@@ -335,7 +351,15 @@ class Person(DslElementRelationOverrides):
         self._label = label
         return self
 
-class Container(DslElementRelationOverrides):
+class Container(DslElementRelationOverrides[
+    'Container',
+    Union[
+        'Person',
+        'SoftwareSystem',
+        'Container',
+        'Component'
+    ]
+]):
     """
     A container (something that can execute code or host data).
     """
@@ -415,7 +439,15 @@ class Container(DslElementRelationOverrides):
     def __dir__(self) -> Iterable[str]:
         return list(super().__dir__()) + list(self._dynamic_attrs.keys())
 
-class Component(DslElementRelationOverrides):
+class Component(DslElementRelationOverrides[
+    'Component',
+    Union[
+        'Person',
+        'SoftwareSystem',
+        'Container',
+        'Component'
+    ]
+]):
     """
     A component (a grouping of related functionality behind an interface that runs inside a container).
     """
@@ -487,6 +519,9 @@ class _FluentSink(DslFluentSink):
         sink = JsonSink()
         sink.write(workspace=self._workspace.model, config=JsonSinkConfig(path=path))
 
+    def get_workspace(self) -> Workspace:
+        return self._workspace
+
 _RankDirection = Literal['tb', 'bt', 'lr', 'rl']
 
 _AutoLayout = Optional[

buildzr/dsl/relations.py

@@ -204,6 +204,8 @@ class _FluentRelationship(DslFluentRelationship[TParent]):
 
         return self._parent
 
+    # TODO: Remove this and replace with something better.
+    # Doesn't feel "fluent."
     def get(self) -> TParent:
         return self._parent
 
@@ -224,7 +226,7 @@ class _RelationshipDescription(Generic[TDst]):
             destination=destination,
         )
 
-class _UsesFromLate(BindLeftLate[TDst]):
+class _UsesFromLate(Generic[TDst], BindLeftLate[TDst]):
     """
     This method is used to create a relationship between one source element with
     multiple destination elements, like so:
@@ -306,7 +308,7 @@ class _UsesFromLate(BindLeftLate[TDst]):
 
         return self
 
-class DslElementRelationOverrides(DslElement):
+class DslElementRelationOverrides(Generic[TSrc, TDst], DslElement[TSrc, TDst]):
 
     """
     Base class meant to be derived from to override the `__rshift__` method to
@@ -316,7 +318,7 @@ class DslElementRelationOverrides(DslElement):
 
     # TODO: Check why need to ignore the override error here.
     @overload  # type: ignore[override]
-    def __rshift__(self, other: DslElement) -> _Relationship[Self, DslElement]:
+    def __rshift__(self, other: TDst) -> _Relationship[Self, TDst]:
         """
         Create a relationship between the source element and the destination
         without specifying description or technology.
@@ -326,30 +328,30 @@ class DslElementRelationOverrides(DslElement):
         ...
 
     @overload
-    def __rshift__(self, description_and_technology: Tuple[str, str]) -> _UsesFrom[Self, DslElement]:
+    def __rshift__(self, description_and_technology: Tuple[str, str]) -> _UsesFrom[Self, TDst]:
         ...
 
     @overload
-    def __rshift__(self, description: str) -> _UsesFrom[Self, DslElement]:
+    def __rshift__(self, description: str) -> _UsesFrom[Self, TDst]:
         ...
 
     @overload
-    def __rshift__(self, _RelationshipDescription: _RelationshipDescription[DslElement]) -> _UsesFrom[Self, DslElement]:
+    def __rshift__(self, _RelationshipDescription: _RelationshipDescription[TDst]) -> _UsesFrom[Self, TDst]:
         ...
 
     @overload
-    def __rshift__(self, multiple_destinations: List[Union[DslElement, _UsesFromLate[DslElement]]]) -> List[_Relationship[Self, DslElement]]:
+    def __rshift__(self, multiple_destinations: List[Union[TDst, _UsesFromLate[TDst]]]) -> List[_Relationship[Self, TDst]]:
         ...
 
     def __rshift__(
             self,
             other: Union[
-                DslElement,
+                TDst,
                 str,
                 Tuple[str, str],
-                _RelationshipDescription[DslElement],
-                List[Union[DslElement, _UsesFromLate[DslElement]]]
-            ]) -> Union[_UsesFrom[Self, DslElement], _Relationship[Self, DslElement], List[_Relationship[Self, DslElement]]]:
+                _RelationshipDescription[TDst],
+                List[Union[TDst, _UsesFromLate[TDst]]]
+            ]) -> Union[_UsesFrom[Self, TDst], _Relationship[Self, TDst], List[_Relationship[Self, TDst]]]:
         if isinstance(other, DslElement):
             return cast(
                 _Relationship[Self, DslElement],
@@ -364,8 +366,8 @@ class DslElementRelationOverrides(DslElement):
             return _UsesFrom(self, description=other[0], technology=other[1])
         elif isinstance(other, _RelationshipDescription):
             return _UsesFrom(self, description=other._description, technology=other._technology)
-        elif _is_list_of_dslelements_or_usesfromlates(other):
-            relationships: List[_Relationship[Self, DslElement]] = []
+        elif isinstance(other, list):
+            relationships: List[_Relationship[Self, TDst]] = []
             for dest in other:
                 if isinstance(dest, _UsesFromLate):
                     dest.set_source(self)
@@ -373,14 +375,21 @@ class DslElementRelationOverrides(DslElement):
                 elif isinstance(dest, DslElement):
                     relationships.append(
                         cast(
-                            _Relationship[Self, DslElement],
+                            _Relationship[Self, DslElement[Self, TDst]],
                             cast(
-                                _UsesFrom[Self, DslElement],
+                                _UsesFrom[Self, DslElement[Self, TDst]],
                                 _UsesFrom(self)
                             ) >> dest
                         )
                     )
-            return relationships
+            return cast(
+                Union[
+                    List[_Relationship[Self, TDst]],
+                    _UsesFrom[Self, TDst],
+                    _Relationship[Self, TDst],
+                ],
+                relationships
+            )
         else:
             raise TypeError(f"Unsupported operand type for >>: '{type(self).__name__}' and {type(other).__name__}")
 

{buildzr-0.0.6.dist-info → buildzr-0.0.7.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: buildzr
-Version: 0.0.6
+Version: 0.0.7
 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.6.dist-info → buildzr-0.0.7.dist-info}/RECORD

@@ -1,10 +1,10 @@
-buildzr/__about__.py,sha256=zSWM6APnGVgRI-TIdUtzLBHHIR2hrWqWRT-LJJe2kbQ,17
+buildzr/__about__.py,sha256=mxN_6Jqd8AWInKb6pHwebAtbTNsZmgF0Jj4L8NNGU5I,17
 buildzr/__init__.py,sha256=hY-cOdjBQcz0v2m8cBF1oEJFIbcR3sWI-xww--0RKSo,99
 buildzr/dsl/__init__.py,sha256=paxuMCCDuOs1eSvBPyuW5pv5j1UZD6TxRZcCzC2iKss,307
-buildzr/dsl/dsl.py,sha256=B3mBXhrOFrv59GMLr8T2mZmJB17vcFx6M06Dr_SlaH8,34218
+buildzr/dsl/dsl.py,sha256=7KUe_YLSjOKG5D5MDJkJddt2evYM_Q1JeSkBMsu-83w,34782
 buildzr/dsl/explorer.py,sha256=numMPqD3RYJ1oeMgX5wYnT6aHRHmBN2EsFZFYRuFffA,2523
 buildzr/dsl/expression.py,sha256=UinOUL3nJytZR8ylnVtVkJ0YoWoWspU9DQeDpg0nIEQ,6927
-buildzr/dsl/relations.py,sha256=nfj0EZIo0RpQxe7Ng-40WHBOVom_aE20-45GzWMEvII,13723
+buildzr/dsl/relations.py,sha256=SajN7beDhPFYnJ-4RXgJ4YGY5g-7Uw9n8IDlysGMmNg,13978
 buildzr/dsl/factory/__init__.py,sha256=niaYqvNPUWJejoPyRyABUtzVsoxaV8eSjzS9dta4bMI,30
 buildzr/dsl/factory/gen_id.py,sha256=LnaeOCMngSvYkcGnuARjQYoUVWdcOoNHO2EHe6PMGco,538
 buildzr/dsl/interfaces/__init__.py,sha256=z8d8HzL64m8aT_HHM3mCVZoNwh_QhsYv0apGz-EX9Us,268
@@ -17,7 +17,7 @@ buildzr/models/models.py,sha256=0LhLG1wmbt4dvROV5MEBZLLoxPbMpkUsOqNz525cynE,4248
 buildzr/sinks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 buildzr/sinks/interfaces.py,sha256=LOZekP4WNjomD5J5f3FnZTwGj0aXMr6RbrvyFV5zn0E,383
 buildzr/sinks/json_sink.py,sha256=onKOZTpwOQfeMEj1ONkuIEHBAQhx4yQSqqI_lgZBaP8,777
-buildzr-0.0.6.dist-info/METADATA,sha256=V253gn2ANdye9PzqG50OnZh6AivL-omfUuBY10ue8q8,6237
-buildzr-0.0.6.dist-info/WHEEL,sha256=3U_NnUcV_1B1kPkYaPzN-irRckL5VW_lytn0ytO_kRY,87
-buildzr-0.0.6.dist-info/licenses/LICENSE.md,sha256=e8e6W6tL4MbBY-c-gXMgDbaMf_BnaQDQv4Yoy42b-CI,1070
-buildzr-0.0.6.dist-info/RECORD,,
+buildzr-0.0.7.dist-info/METADATA,sha256=eVaFO4ZV4LROB8GVPIYxjSqeuXZw3RVNP0eSOnOKoTA,6237
+buildzr-0.0.7.dist-info/WHEEL,sha256=C2FUgwZgiLbznR-k0b_5k3Ai_1aASOXDss3lzCUsUug,87
+buildzr-0.0.7.dist-info/licenses/LICENSE.md,sha256=e8e6W6tL4MbBY-c-gXMgDbaMf_BnaQDQv4Yoy42b-CI,1070
+buildzr-0.0.7.dist-info/RECORD,,

{buildzr-0.0.6.dist-info → buildzr-0.0.7.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.26.1
+Generator: hatchling 1.26.3
 Root-Is-Purelib: true
 Tag: py3-none-any