fastapi-voyager 0.7.1__tar.gz → 0.7.3__tar.gz

{fastapi_voyager-0.7.1 → fastapi_voyager-0.7.3}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-voyager
-Version: 0.7.1
+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
@@ -203,7 +203,13 @@ TODO: ...
 
 ## Changelog
 
-- 0.7.1:
-    - support brief mode, you can use `--module_prefix tests.service` to show links between routes and filtered schemas, to make the graph less complicated.
-- 0.6.2: 
-    - fix generic related issue
+- 0.7:
+    - 0.7.3
+        - fix `module_color` failure
+    - 0.7.2
+        - keep links inside filtered nodes.
+    - 0.7.1
+        - support brief mode, you can use `--module_prefix tests.service` to show links between routes and filtered schemas, to make the graph less complicated.
+- 0.6: 
+    - 0.6.2: 
+        - fix generic related issue

{fastapi_voyager-0.7.1 → fastapi_voyager-0.7.3}/README.md

@@ -176,7 +176,13 @@ TODO: ...
 
 ## Changelog
 
-- 0.7.1:
-    - support brief mode, you can use `--module_prefix tests.service` to show links between routes and filtered schemas, to make the graph less complicated.
-- 0.6.2: 
-    - fix generic related issue
+- 0.7:
+    - 0.7.3
+        - fix `module_color` failure
+    - 0.7.2
+        - keep links inside filtered nodes.
+    - 0.7.1
+        - support brief mode, you can use `--module_prefix tests.service` to show links between routes and filtered schemas, to make the graph less complicated.
+- 0.6: 
+    - 0.6.2: 
+        - fix generic related issue

{fastapi_voyager-0.7.1 → fastapi_voyager-0.7.3}/src/fastapi_voyager/filter.py

@@ -183,6 +183,13 @@ def filter_subgraph(
                 if next_node not in visited:
                     queue.append(next_node)
 
-    filtered_links = tag_route_links + merged_links
+    module_prefix_links = [
+        lk
+        for lk in links
+        if (lk.source_origin or "").startswith(module_prefix)
+        and (lk.target_origin or "").startswith(module_prefix)
+    ]
+
+    filtered_links = tag_route_links + merged_links + module_prefix_links
 
     return tags, routes, filtered_nodes, filtered_links

{fastapi_voyager-0.7.1 → fastapi_voyager-0.7.3}/src/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-0.7.1 → fastapi_voyager-0.7.3}/src/fastapi_voyager/version.py

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

{fastapi_voyager-0.7.1 → fastapi_voyager-0.7.3}/tests/demo.py

@@ -2,7 +2,7 @@ from pydantic import BaseModel, Field
 from fastapi import FastAPI
 from typing import Optional, Generic, TypeVar
 from pydantic_resolve import ensure_subset, Resolver
-from tests.service.schema import Story, Task
+from tests.service.schema import Story, Task, A
 import tests.service.schema as serv
 
 app = FastAPI(title="Demo API", description="A demo FastAPI application for router visualization")
@@ -73,4 +73,8 @@ type DataModelPageStory = DataModel[PageStory]
 
 @app.get("/page_test_1/", tags=['for-page'], response_model=DataModelPageStory)
 def get_page_test_1():
-    return {} # no implementation
+    return {} # no implementation
+
+@app.get("/page_test_2/", tags=['for-page'], response_model=A)
+def get_page_test_2():
+    return {}

{fastapi_voyager-0.7.1 → fastapi_voyager-0.7.3}/tests/service/schema.py

@@ -23,3 +23,10 @@ class Member(BaseModel):
     first_name: str
     last_name: str
 
+
+class B(BaseModel):
+    id: int
+
+class A(BaseModel):
+    id: int
+    b: B