fastapi-voyager 0.7.2__py3-none-any.whl → 0.7.3__py3-none-any.whl

fastapi_voyager/render.py

@@ -1,3 +1,4 @@
+from typing import Optional
 from fastapi_voyager.type import SchemaNode, ModuleNode, Link, Tag, Route, FieldType, PK, ModuleRoute
 from fastapi_voyager.module import build_module_schema_tree, build_module_route_tree
 
@@ -61,33 +62,44 @@ class Renderer:
         else:
             raise ValueError(f'Unknown link type: {link.type}')
 
-    def render_module_schema(self, mod: ModuleNode) -> str:
-        color = self.module_color.get(mod.fullname)
-        inner_nodes = [
-            f'''
-                "{node.id}" [
-                    label = {self.render_schema_label(node)}
-                    shape = "plain"
-                    margin="0.5,0.1"
-                ];''' for node in mod.schema_nodes
-        ]
-        inner_nodes_str = '\n'.join(inner_nodes)
-        child_str = '\n'.join(self.render_module_schema(m) for m in mod.modules)
-        return f'''
-            subgraph cluster_module_{mod.fullname.replace('.', '_')} {{
-                tooltip="{mod.fullname}"
-                color = "#666"
-                style="rounded"
-                label = "  {mod.name}"
-                labeljust = "l"
-                {(f'pencolor = "{color}"' if color else 'pencolor="#ccc"')}
-                {(f'penwidth = 3' if color else 'penwidth=""')}
-                {inner_nodes_str}
-                {child_str}
-            }}'''
+    def render_module_schema_wrapper(self, mods: list[ModuleNode]) -> str:
+        module_color_flag = set(self.module_color.keys())
+        print(module_color_flag)
+
+        def render_module_schema(mod: ModuleNode) -> str:
+            color: Optional[str] = None
+
+            for k in module_color_flag:
+                if mod.fullname.startswith(k):
+                    module_color_flag.remove(k)
+                    color = self.module_color[k]
+                    break
+
+            inner_nodes = [
+                f'''
+                    "{node.id}" [
+                        label = {self.render_schema_label(node)}
+                        shape = "plain"
+                        margin="0.5,0.1"
+                    ];''' for node in mod.schema_nodes
+            ]
+            inner_nodes_str = '\n'.join(inner_nodes)
+            child_str = '\n'.join(render_module_schema(m) for m in mod.modules)
+            return f'''
+                subgraph cluster_module_{mod.fullname.replace('.', '_')} {{
+                    tooltip="{mod.fullname}"
+                    color = "#666"
+                    style="rounded"
+                    label = "  {mod.name}"
+                    labeljust = "l"
+                    {(f'pencolor = "{color}"' if color else 'pencolor="#ccc"')}
+                    {(f'penwidth = 3' if color else 'penwidth=""')}
+                    {inner_nodes_str}
+                    {child_str}
+                }}'''
+        return '\n'.join(render_module_schema(m) for m in mods)
     
     def render_module_route(self, mod: ModuleRoute) -> str:
-        color = self.module_color.get(mod.fullname)
         # Inner route nodes, same style as flat route_str
         inner_nodes = [
             f'''
@@ -106,8 +118,6 @@ class Renderer:
                 style="rounded"
                 label = "  {mod.name}"
                 labeljust = "l"
-                {(f'pencolor = "{color}"' if color else 'pencolor="#ccc"')}
-                {(f'penwidth = 3' if color else 'penwidth=""')}
                 {inner_nodes_str}
                 {child_str}
             }}'''
@@ -126,7 +136,7 @@ class Renderer:
         ])
 
 
-        module_schemas_str = '\n'.join(self.render_module_schema(m) for m in module_schemas)
+        module_schemas_str = self.render_module_schema_wrapper(module_schemas)
         module_routes_str = '\n'.join(self.render_module_route(m) for m in module_routes)
         link_str = '\n'.join(self.render_link(link) for link in links)
 

fastapi_voyager/version.py

@@ -1,2 +1,2 @@
 __all__ = ["__version__"]
-__version__ = "0.7.2"
+__version__ = "0.7.3"

{fastapi_voyager-0.7.2.dist-info → fastapi_voyager-0.7.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-voyager
-Version: 0.7.2
+Version: 0.7.3
 Summary: Visualize FastAPI application's routing tree and dependencies
 Project-URL: Homepage, https://github.com/allmonday/fastapi-voyager
 Project-URL: Source, https://github.com/allmonday/fastapi-voyager
@@ -204,6 +204,8 @@ TODO: ...
 ## Changelog
 
 - 0.7:
+    - 0.7.3
+        - fix `module_color` failure
     - 0.7.2
         - keep links inside filtered nodes.
     - 0.7.1

{fastapi_voyager-0.7.2.dist-info → fastapi_voyager-0.7.3.dist-info}/RECORD

@@ -2,11 +2,11 @@ fastapi_voyager/__init__.py,sha256=E5WTV_sYs2LK8I6jzA7AuvFU5a8_vjnDseC3DMha0iQ,1
 fastapi_voyager/cli.py,sha256=2eixX7mtPsZvukc4vrwQOt6XTPJgHUKIGLBy3IIC2jE,11127
 fastapi_voyager/filter.py,sha256=2Yt37o8mhqSqleafO4YRrumh_ExYUqzXFOxQRPuTbAc,8078
 fastapi_voyager/module.py,sha256=Z2QHNmiLk6ZAJlm2nSmO875Q33TweSg8UxZSzIpU9zY,3499
-fastapi_voyager/render.py,sha256=ctwad-KNbFajhgnA8OI8412s6s67UbV-dvZFXBt_Ssg,7410
+fastapi_voyager/render.py,sha256=rOJEKqiIAPowa3kZheRIgZMnbNzHQz9QoJM5aWUfXXs,7744
 fastapi_voyager/server.py,sha256=UT-fHggdqicIo5m3uUX86-XFhAVDLXpXBsBQwd1HdIg,4001
 fastapi_voyager/type.py,sha256=nad4WNxTcZFi7Mskw6p2W7v2Gs4f0giVLNoFjZlKmbA,1778
 fastapi_voyager/type_helper.py,sha256=f2Gy5r3Zi6a2wTkbqU9W-AkvcetajEYCfroACzcIcVY,9064
-fastapi_voyager/version.py,sha256=PvKHya-0S2FiTp3eTEPk4ccgA86pgtDfAJ-N601Tvss,48
+fastapi_voyager/version.py,sha256=yQ9Z94li508cueSQbrmr6mCxqTFxZVqAMN1_3i0wslM,48
 fastapi_voyager/voyager.py,sha256=uOQEzrs3o6UUUswvHGRKELNWYUH1ix0Z7SbzMHwm320,10709
 fastapi_voyager/web/graph-ui.js,sha256=eEjDnJVMvk35LdRoxcqX_fZxLFS9_bUrGAZL6K2O5C0,4176
 fastapi_voyager/web/graphviz.svg.css,sha256=zDCjjpT0Idufu5YOiZI76PL70-avP3vTyzGPh9M85Do,1563
@@ -26,8 +26,8 @@ fastapi_voyager/web/icon/favicon-16x16.png,sha256=JC07jEzfIYxBIoQn_FHXvyHuxESdhW
 fastapi_voyager/web/icon/favicon-32x32.png,sha256=C7v1h58cfWOsiLp9yOIZtlx-dLasBcq3NqpHVGRmpt4,1859
 fastapi_voyager/web/icon/favicon.ico,sha256=tZolYIXkkBcFiYl1A8ksaXN2VjGamzcSdes838dLvNc,15406
 fastapi_voyager/web/icon/site.webmanifest,sha256=ep4Hzh9zhmiZF2At3Fp1dQrYQuYF_3ZPZxc1KcGBvwQ,263
-fastapi_voyager-0.7.2.dist-info/METADATA,sha256=4BI77g1dUQy0LM7Vkl8JlRgPBjFL07de6QHPFV5Dego,7154
-fastapi_voyager-0.7.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-fastapi_voyager-0.7.2.dist-info/entry_points.txt,sha256=pEIKoUnIDXEtdMBq8EmXm70m16vELIu1VPz9-TBUFWM,53
-fastapi_voyager-0.7.2.dist-info/licenses/LICENSE,sha256=lNVRR3y_bFVoFKuK2JM8N4sFaj3m-7j29kvL3olFi5Y,1067
-fastapi_voyager-0.7.2.dist-info/RECORD,,
+fastapi_voyager-0.7.3.dist-info/METADATA,sha256=zmLDE0ge68ohzR8MyukOKV-HMgAKpbHPXEb3ouOBwLE,7203
+fastapi_voyager-0.7.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+fastapi_voyager-0.7.3.dist-info/entry_points.txt,sha256=pEIKoUnIDXEtdMBq8EmXm70m16vELIu1VPz9-TBUFWM,53
+fastapi_voyager-0.7.3.dist-info/licenses/LICENSE,sha256=lNVRR3y_bFVoFKuK2JM8N4sFaj3m-7j29kvL3olFi5Y,1067
+fastapi_voyager-0.7.3.dist-info/RECORD,,