fastapi-voyager 0.5.2__tar.gz → 0.6.1__tar.gz

{fastapi_voyager-0.5.2 → fastapi_voyager-0.6.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-voyager
-Version: 0.5.2
+Version: 0.6.1
 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
@@ -183,6 +183,13 @@ features
     - [ ] abstract render module
 - [ ] export voyager core data into json (for better debugging)
     - [ ] add api to rebuild core data from json, and render it
+- [ ] fix Generic case
+
+```python
+    class Paged(BaseModel, Generic[T]):
+    total: int
+    items: List[T]
+```
 
 bugs:
 - [ ] fix duplicated link from class and parent class, it also break clicking highlight

{fastapi_voyager-0.5.2 → fastapi_voyager-0.6.1}/README.md

@@ -156,6 +156,13 @@ features
     - [ ] abstract render module
 - [ ] export voyager core data into json (for better debugging)
     - [ ] add api to rebuild core data from json, and render it
+- [ ] fix Generic case
+
+```python
+    class Paged(BaseModel, Generic[T]):
+    total: int
+    items: List[T]
+```
 
 bugs:
 - [ ] fix duplicated link from class and parent class, it also break clicking highlight

{fastapi_voyager-0.5.2 → fastapi_voyager-0.6.1}/src/fastapi_voyager/cli.py

@@ -169,6 +169,12 @@ Examples:
         default=8000,
         help="Port for the preview server when --server is used (default: 8000)"
     )
+    parser.add_argument(
+        "--host",
+        type=str,
+        default="127.0.0.1",
+        help="Host/IP for the preview server when --server is used (default: 127.0.0.1). Use 0.0.0.0 to listen on all interfaces."
+    )
     
     parser.add_argument(
         "--version", "-v",
@@ -267,8 +273,8 @@ Examples:
                 print("Error: uvicorn is required to run the server. Install via 'pip install uvicorn' or 'uv add uvicorn'.")
                 sys.exit(1)
             app_server = viz_server.create_app_with_fastapi(app, module_color=module_color)
-            print(f"Starting preview server at http://127.0.0.1:{args.port} ... (Ctrl+C to stop)")
-            uvicorn.run(app_server, host="127.0.0.1", port=args.port)
+            print(f"Starting preview server at http://{args.host}:{args.port} ... (Ctrl+C to stop)")
+            uvicorn.run(app_server, host=args.host, port=args.port)
         else:
             # Generate and write dot file locally
             generate_visualization(

fastapi_voyager-0.6.1/src/fastapi_voyager/module.py

@@ -0,0 +1,99 @@
+from typing import Callable, Type, TypeVar, Any
+from fastapi_voyager.type import SchemaNode, ModuleNode, Route, ModuleRoute
+
+
+N = TypeVar('N')  # Node type: ModuleNode or ModuleRoute
+I = TypeVar('I')  # Item type: SchemaNode or Route
+
+
+def _build_module_tree(
+    items: list[I],
+    *,
+    get_module_path: Callable[[I], str | None],
+    NodeClass: Type[N],
+    item_list_attr: str,
+) -> list[N]:
+    """
+    Generic builder that groups items by dotted module path into a tree of NodeClass.
+
+    NodeClass must accept kwargs: name, fullname, modules(list), and an item list via
+    item_list_attr (e.g., 'schema_nodes' or 'routes').
+    """
+    # Map from top-level module name to node
+    top_modules: dict[str, N] = {}
+    # Items without module path
+    root_level_items: list[I] = []
+
+    def make_node(name: str, fullname: str) -> N:
+        kwargs: dict[str, Any] = {
+            'name': name,
+            'fullname': fullname,
+            'modules': [],
+            item_list_attr: [],
+        }
+        return NodeClass(**kwargs)  # type: ignore[arg-type]
+
+    def get_or_create(child_name: str, parent: N) -> N:
+        for m in getattr(parent, 'modules'):
+            if m.name == child_name:
+                return m
+        parent_full = getattr(parent, 'fullname')
+        fullname = child_name if not parent_full or parent_full == "__root__" else f"{parent_full}.{child_name}"
+        new_node = make_node(child_name, fullname)
+        getattr(parent, 'modules').append(new_node)
+        return new_node
+
+    # Build the tree
+    for it in items:
+        module_path = get_module_path(it) or ""
+        if not module_path:
+            root_level_items.append(it)
+            continue
+        parts = module_path.split('.')
+        top_name = parts[0]
+        if top_name not in top_modules:
+            top_modules[top_name] = make_node(top_name, top_name)
+        current = top_modules[top_name]
+        for part in parts[1:]:
+            current = get_or_create(part, current)
+        getattr(current, item_list_attr).append(it)
+
+    result: list[N] = list(top_modules.values())
+    if root_level_items:
+        result.append(make_node("__root__", "__root__"))
+        setattr(result[-1], item_list_attr, root_level_items)
+
+    # Collapse linear chains: no items on node and exactly one child module
+    def collapse(node: N) -> None:
+        while len(getattr(node, 'modules')) == 1 and len(getattr(node, item_list_attr)) == 0:
+            child = getattr(node, 'modules')[0]
+            node.name = f"{node.name}.{child.name}"
+            node.fullname = child.fullname
+            setattr(node, item_list_attr, getattr(child, item_list_attr))
+            setattr(node, 'modules', getattr(child, 'modules'))
+        for m in getattr(node, 'modules'):
+            collapse(m)
+
+    for top in result:
+        collapse(top)
+
+    return result
+
+def build_module_schema_tree(schema_nodes: list[SchemaNode]) -> list[ModuleNode]:
+    """Build a module tree for schema nodes, grouped by their module path."""
+    return _build_module_tree(
+        schema_nodes,
+        get_module_path=lambda sn: sn.module,
+        NodeClass=ModuleNode,
+        item_list_attr='schema_nodes',
+    )
+
+
+def build_module_route_tree(routes: list[Route]) -> list[ModuleRoute]:
+    """Build a module tree for routes, grouped by their module path."""
+    return _build_module_tree(
+        routes,
+        get_module_path=lambda r: r.module,
+        NodeClass=ModuleRoute,
+        item_list_attr='routes',
+    )

{fastapi_voyager-0.5.2 → fastapi_voyager-0.6.1}/src/fastapi_voyager/render.py

@@ -1,5 +1,5 @@
-from fastapi_voyager.type import SchemaNode, ModuleNode, Link, Tag, Route, FieldType, PK
-from fastapi_voyager.module import build_module_tree
+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
 
 
 class Renderer:
@@ -51,7 +51,7 @@ class Renderer:
         if link.type == 'tag_route':
             return f"""{h(link.source)}:e -> {h(link.target)}:w [style = "solid", minlen=3];"""
         elif link.type == 'route_to_schema':
-            return f"""{h(link.source)}:e -> {h(link.target)}:{PK} [style = "solid", dir="back", arrowtail="odot", minlen=3];"""
+            return f"""{h(link.source)}:e -> {h(link.target)}:w [style = "solid", dir="back", arrowtail="odot", minlen=3];"""
         elif link.type == 'schema':
             return f"""{h(link.source)}:e -> {h(link.target)}:w [style = "solid", label = "", dir="back", minlen=3, arrowtail="odot"];"""
         elif link.type == 'parent':
@@ -61,7 +61,7 @@ class Renderer:
         else:
             raise ValueError(f'Unknown link type: {link.type}')
 
-    def render_module(self, mod: ModuleNode) -> str:
+    def render_module_schema(self, mod: ModuleNode) -> str:
         color = self.module_color.get(mod.fullname)
         inner_nodes = [
             f'''
@@ -72,7 +72,7 @@ class Renderer:
                 ];''' for node in mod.schema_nodes
         ]
         inner_nodes_str = '\n'.join(inner_nodes)
-        child_str = '\n'.join(self.render_module(m) for m in mod.modules)
+        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}"
@@ -85,9 +85,36 @@ class Renderer:
                 {inner_nodes_str}
                 {child_str}
             }}'''
+    
+    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'''
+            "{r.id}" [
+                label = "    {r.name}    "
+                margin="0.5,0.1"
+                shape = "record"
+            ];''' for r in mod.routes
+        ]
+        inner_nodes_str = '\n'.join(inner_nodes)
+        child_str = '\n'.join(self.render_module_route(m) for m in mod.modules)
+        return f'''
+            subgraph cluster_route_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_dot(self, tags: list[Tag], routes: list[Route], nodes: list[SchemaNode], links: list[Link]) -> str:
-        modules = build_module_tree(nodes)
+        module_schemas = build_module_schema_tree(nodes)
+        module_routes = build_module_route_tree(routes)
 
         tag_str = '\n'.join([
             f'''
@@ -98,16 +125,9 @@ class Renderer:
             ];''' for t in tags
         ])
 
-        route_str = '\n'.join([
-            f'''
-            "{r.id}" [
-                label = "    {r.name}    "
-                margin="0.5,0.1"
-                shape = "record"
-            ];''' for r in routes
-        ])
 
-        modules_str = '\n'.join(self.render_module(m) for m in modules)
+        module_schemas_str = '\n'.join(self.render_module_schema(m) for m in 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)
 
         dot_str = f'''
@@ -144,7 +164,7 @@ class Renderer:
                 label = "  Routes"
                 labeljust = "l"
                 fontsize = "20"
-                {route_str}
+                {module_routes_str}
             }}
 
             subgraph cluster_schema {{
@@ -154,7 +174,7 @@ class Renderer:
                 label="  Schema"
                 labeljust="l"
                 fontsize="20"
-                    {modules_str}
+                    {module_schemas_str}
             }}
 
             {link_str}

{fastapi_voyager-0.5.2 → fastapi_voyager-0.6.1}/src/fastapi_voyager/server.py

@@ -1,6 +1,6 @@
 from pathlib import Path
 from typing import Optional
-from fastapi import FastAPI
+from fastapi import FastAPI, APIRouter
 from starlette.middleware.gzip import GZipMiddleware
 from pydantic import BaseModel
 from fastapi.responses import HTMLResponse, PlainTextResponse, JSONResponse
@@ -33,23 +33,13 @@ class Payload(BaseModel):
 	show_fields: str = 'object'
 	show_meta: bool = False
 
-def create_app_with_fastapi(
+def create_route(
 	target_app: FastAPI,
 	module_color: dict[str, str] | None = None,
-	gzip_minimum_size: int | None = 500,
-) -> FastAPI:
-	"""Create a FastAPI server that serves DOT computed via Analytics.
-
-	This avoids module-level globals by keeping state in closures.
-	"""
-
-	app = FastAPI(title="fastapi-voyager demo server")
+):
+	router = APIRouter(tags=['fastapi-voyager'])
 
-	# Enable gzip compression for larger responses (e.g. DOT / schemas payload)
-	if gzip_minimum_size is not None and gzip_minimum_size >= 0:
-		app.add_middleware(GZipMiddleware, minimum_size=gzip_minimum_size)
-
-	@app.get("/dot", response_model=OptionParam)
+	@router.get("/dot", response_model=OptionParam)
 	def get_dot() -> str:
 		voyager = Voyager(module_color=module_color, load_meta=True)
 		voyager.analysis(target_app)
@@ -71,7 +61,7 @@ def create_app_with_fastapi(
 
 		return OptionParam(tags=tags, schemas=schemas, dot=dot)
 
-	@app.post("/dot", response_class=PlainTextResponse)
+	@router.post("/dot", response_class=PlainTextResponse)
 	def get_filtered_dot(payload: Payload) -> str:
 		voyager = Voyager(
 			include_tags=payload.tags,
@@ -85,7 +75,7 @@ def create_app_with_fastapi(
 		voyager.analysis(target_app)
 		return voyager.render_dot()
 
-	@app.post("/dot-core-data", response_model=CoreData)
+	@router.post("/dot-core-data", response_model=CoreData)
 	def get_filtered_dot_core_data(payload: Payload) -> str:
 		voyager = Voyager(
 			include_tags=payload.tags,
@@ -98,13 +88,13 @@ def create_app_with_fastapi(
 		)
 		voyager.analysis(target_app)
 		return voyager.dump_core_data()
-	
-	@app.post('/dot-render-core-data', response_class=PlainTextResponse)
+
+	@router.post('/dot-render-core-data', response_class=PlainTextResponse)
 	def render_dot_from_core_data(core_data: CoreData) -> str:
 		renderer = Renderer(show_fields=core_data.show_fields, module_color=core_data.module_color, schema=core_data.schema)
 		return renderer.render_dot(core_data.tags, core_data.routes, core_data.nodes, core_data.links)
 
-	@app.get("/", response_class=HTMLResponse)
+	@router.get("/", response_class=HTMLResponse)
 	def index():
 		index_file = WEB_DIR / "index.html"
 		if index_file.exists():
@@ -120,8 +110,22 @@ def create_app_with_fastapi(
 		</html>
 		"""
 
-	# Serve static files under /static
-	app.mount("/static", StaticFiles(directory=str(WEB_DIR)), name="static")
+	return router
+
+
+def create_app_with_fastapi(
+	target_app: FastAPI,
+	module_color: dict[str, str] | None = None,
+	gzip_minimum_size: int | None = 500,
+) -> FastAPI:
+	router = create_route(target_app, module_color=module_color)
+
+	app = FastAPI(title="fastapi-voyager demo server")
+	if gzip_minimum_size is not None and gzip_minimum_size >= 0:
+		app.add_middleware(GZipMiddleware, minimum_size=gzip_minimum_size)
+
+	app.mount("/fastapi-voyager-static", StaticFiles(directory=str(WEB_DIR)), name="static")
+	app.include_router(router)
 
 	return app
 

{fastapi_voyager-0.5.2 → fastapi_voyager-0.6.1}/src/fastapi_voyager/type.py

@@ -21,9 +21,17 @@ class Tag(NodeBase):
 
 @dataclass
 class Route(NodeBase):
+    module: str
     source_code: str = ''
     vscode_link: str = ''  # optional vscode deep link
 
+@dataclass
+class ModuleRoute:
+    name: str
+    fullname: str
+    routes: list[Route]
+    modules: list['ModuleRoute']
+
 @dataclass
 class SchemaNode(NodeBase):
     module: str

{fastapi_voyager-0.5.2 → fastapi_voyager-0.6.1}/src/fastapi_voyager/type_helper.py

@@ -142,7 +142,7 @@ def get_type_name(anno):
 
 
 def is_inheritance_of_pydantic_base(cls):
-    return issubclass(cls, BaseModel) and cls is not BaseModel
+    return safe_issubclass(cls, BaseModel) and cls is not BaseModel
 
 
 def get_bases_fields(schemas: list[type[BaseModel]]) -> set[str]:
@@ -228,6 +228,7 @@ def safe_issubclass(kls, classinfo):
     try:
         return issubclass(kls, classinfo)
     except TypeError:
+        print(kls.__name__, 'is not a class')
         return False
 
 

{fastapi_voyager-0.5.2 → fastapi_voyager-0.6.1}/src/fastapi_voyager/version.py

@@ -1,2 +1,2 @@
 __all__ = ["__version__"]
-__version__ = "0.5.2"
+__version__ = "0.6.1"

{fastapi_voyager-0.5.2 → fastapi_voyager-0.6.1}/src/fastapi_voyager/voyager.py

@@ -83,6 +83,7 @@ class Voyager:
             # add route and create links
             route_id = f'{route.endpoint.__name__}_{route.path.replace("/", "_")}'
             route_name = route.endpoint.__name__
+            route_module = route.endpoint.__module__
 
             # filter by route_name (route.id) if provided
             if self.route_name is not None and route_id != self.route_name:
@@ -91,6 +92,7 @@ class Voyager:
             route_obj = Route(
                 id=route_id,
                 name=route_name,
+                module=route_module,
                 vscode_link=get_vscode_link(route.endpoint) if self.load_meta else '',
                 source_code=inspect.getsource(route.endpoint) if self.load_meta else ''
             )

{fastapi_voyager-0.5.2 → fastapi_voyager-0.6.1}/src/fastapi_voyager/web/component/render-graph.js

@@ -31,7 +31,7 @@ export default defineComponent({
 			if (!props.coreData) return;
 			loading.value = true;
 			try {
-				const res = await fetch("/dot-render-core-data", {
+				const res = await fetch("dot-render-core-data", {
 					method: "POST",
 					headers: { "Content-Type": "application/json" },
 					body: JSON.stringify(props.coreData),

{fastapi_voyager-0.5.2 → fastapi_voyager-0.6.1}/src/fastapi_voyager/web/component/schema-field-filter.js

@@ -81,7 +81,7 @@ export default defineComponent({
           schema_field: state.fieldName || null,
           show_fields: state.showFields,
         };
-        const res = await fetch("/dot", {
+        const res = await fetch("dot", {
           method: "POST",
           headers: { "Content-Type": "application/json" },
           body: JSON.stringify(payload),

{fastapi_voyager-0.5.2 → fastapi_voyager-0.6.1}/src/fastapi_voyager/web/index.html

@@ -2,14 +2,14 @@
   <head>
     <title>FastAPI Voyager</title>
     <meta name="theme-color" content="#ffffff" />
-    <link rel="stylesheet" href="/static/graphviz.svg.css" />
-    <link rel="stylesheet" href="/static/quasar.min.css" />
+    <link rel="stylesheet" href="fastapi-voyager-static/graphviz.svg.css" />
+    <link rel="stylesheet" href="fastapi-voyager-static/quasar.min.css" />
     <!-- App Icons / Favicons -->
-    <link rel="apple-touch-icon" sizes="180x180" href="/static/icon/apple-touch-icon.png" />
-    <link rel="icon" type="image/png" sizes="32x32" href="/static/icon/favicon-32x32.png" />
-    <link rel="icon" type="image/png" sizes="16x16" href="/static/icon/favicon-16x16.png" />
-    <link rel="icon" href="/static/icon/favicon.ico" sizes="any" />
-    <link rel="manifest" href="/static/icon/site.webmanifest" />
+    <link rel="apple-touch-icon" sizes="180x180" href="fastapi-voyager-static/icon/apple-touch-icon.png" />
+    <link rel="icon" type="image/png" sizes="32x32" href="fastapi-voyager-static/icon/favicon-32x32.png" />
+    <link rel="icon" type="image/png" sizes="16x16" href="fastapi-voyager-static/icon/favicon-16x16.png" />
+    <link rel="icon" href="fastapi-voyager-static/icon/favicon.ico" sizes="any" />
+    <link rel="manifest" href="fastapi-voyager-static/icon/site.webmanifest" />
     <link
       href="https://fonts.googleapis.com/css?family=Roboto:100,300,400,500,700,900|Material+Icons"
       rel="stylesheet"
@@ -265,8 +265,8 @@
 
     <!-- Add the following at the end of your body tag -->
     <script src="https://cdnjs.cloudflare.com/ajax/libs/vue/3.5.22/vue.global.prod.min.js" integrity="sha512-Y9sKU0AwzWRxKSLd2i35LuDpUdHY/E9tJrKG0mxw0qYQ75VVgGYazIUQPwKhFK9vGO3jIgAtxLiSq8GQ7PDfUg==" crossorigin="anonymous" referrerpolicy="no-referrer"></script>
-    <script src="/static/quasar.min.js"></script>
-    <script src="/static/graphviz.svg.js"></script>
+    <script src="fastapi-voyager-static/quasar.min.js"></script>
+    <script src="fastapi-voyager-static/graphviz.svg.js"></script>
     <!-- highlight.js minimal ES module load (python only) -->
     <link rel="stylesheet" href="https://cdnjs.cloudflare.com/ajax/libs/highlight.js/11.9.0/styles/github.min.css" />
     <script type="module">
@@ -275,6 +275,6 @@
       hljs.registerLanguage('python', python);
       window.hljs = hljs;
     </script>
-    <script type="module" src="/static/vue-main.js"></script>
+    <script type="module" src="fastapi-voyager-static/vue-main.js"></script>
   </body>
 </html>

{fastapi_voyager-0.5.2 → fastapi_voyager-0.6.1}/src/fastapi_voyager/web/vue-main.js

@@ -37,8 +37,8 @@ const app = createApp({
     const dumpJson = ref("");
     const showImportDialog = ref(false);
     const importJsonText = ref("");
-  const showRenderGraph = ref(false);
-  const renderCoreData = ref(null);
+    const showRenderGraph = ref(false);
+    const renderCoreData = ref(null);
     const schemaName = ref(""); // used by detail dialog
     const schemaFieldFilterSchema = ref(null); // external schemaName for schema-field-filter
     const schemaCodeName = ref("");
@@ -94,7 +94,7 @@ const app = createApp({
     async function loadInitial() {
       state.initializing = true;
       try {
-        const res = await fetch("/dot");
+        const res = await fetch("dot");
         const data = await res.json();
         state.rawTags = Array.isArray(data.tags) ? data.tags : [];
         state.rawSchemasFull = Array.isArray(data.schemas) ? data.schemas : [];
@@ -134,7 +134,7 @@ const app = createApp({
           show_fields: state.showFields,
         };
 
-        const res = await fetch("/dot", {
+        const res = await fetch("dot", {
           method: "POST",
           headers: { "Content-Type": "application/json" },
           body: JSON.stringify(payload),
@@ -180,7 +180,7 @@ const app = createApp({
           route_name: state.routeId || null,
           show_fields: state.showFields,
         };
-        const res = await fetch("/dot-core-data", {
+        const res = await fetch("dot-core-data", {
           method: "POST",
           headers: { "Content-Type": "application/json" },
           body: JSON.stringify(payload),

{fastapi_voyager-0.5.2 → fastapi_voyager-0.6.1}/tests/demo.py

@@ -1,6 +1,6 @@
 from pydantic import BaseModel, Field
 from fastapi import FastAPI
-from typing import Optional
+from typing import Optional, Generic, TypeVar
 from pydantic_resolve import ensure_subset, Resolver
 from tests.service.schema import Story, Task
 import tests.service.schema as serv
@@ -56,10 +56,19 @@ async def get_page_info():
     page_overall = PageOverallWrap(content="Page Overall Content", sprints=[]) # focus on schema only
     return await Resolver().resolve(page_overall)
 
-
 class PageStories(BaseModel):
     stories: list[PageStory] 
 
 @app.get("/page_info/", tags=['for-page'], response_model=PageStories)
 def get_page_stories():
+    return {} # no implementation
+
+
+T = TypeVar('T')
+class DataModel(BaseModel, Generic[T]):
+    data: T
+    id: int
+
+@app.get("/page_test_1/", tags=['for-page'], response_model=DataModel[PageStory])
+def get_page_test_1():
     return {} # no implementation

fastapi_voyager-0.6.1/tests/programatic.py

@@ -0,0 +1,8 @@
+from fastapi import FastAPI
+from fastapi_voyager.server import create_app_with_fastapi
+from tests.demo import app as demo_app
+
+subapp = create_app_with_fastapi(demo_app)
+
+app = FastAPI()
+app.mount("/xxx", subapp)

{fastapi_voyager-0.5.2 → fastapi_voyager-0.6.1}/tests/test_module.py

@@ -1,4 +1,4 @@
-from fastapi_voyager.module import build_module_tree
+from fastapi_voyager.module import build_module_schema_tree
 from fastapi_voyager.type import SchemaNode
 
 
@@ -24,7 +24,7 @@ def test_build_module_tree_basic():
     ]
 
     # Act
-    top_modules = build_module_tree(schema_nodes)
+    top_modules = build_module_schema_tree(schema_nodes)
     from pprint import pprint
     pprint(top_modules)
 
@@ -58,7 +58,7 @@ def test_build_module_tree_basic():
 
 
 def test_build_module_tree_empty_input():
-    top_modules = build_module_tree([])
+    top_modules = build_module_schema_tree([])
     assert top_modules == []
 
 
@@ -70,7 +70,7 @@ def test_build_module_tree_root_level_nodes():
         _sn("PkgA", "pkg", "PkgA"),
     ]
 
-    top_modules = build_module_tree(schema_nodes)
+    top_modules = build_module_schema_tree(schema_nodes)
     names = sorted(m.name for m in top_modules)
     assert names == ["__root__", "pkg"]
     root = _find_top(top_modules, "__root__")
@@ -86,7 +86,7 @@ def test_collapse_single_child_empty_modules():
         _sn("Deep", "a.b.c.d", "Deep"),
         _sn("Peer", "a.b.x", "Peer"),
     ]
-    top_modules = build_module_tree(schema_nodes)
+    top_modules = build_module_schema_tree(schema_nodes)
     print(top_modules)
     # 'a' should have one child path 'b', but due to branching at x, only a.b collapses into a.b
     # and below it, 'c.d' should collapse to 'c.d'. Final structure:

fastapi_voyager-0.5.2/src/fastapi_voyager/module.py

@@ -1,64 +0,0 @@
-from fastapi_voyager.type import SchemaNode, ModuleNode
-
-def build_module_tree(schema_nodes: list[SchemaNode]) -> list[ModuleNode]:
-    """
-    1. the name of module_node comes from schema_node's module field
-    2. split the module_name with '.' to create a tree structure
-    3. group schema_nodes under the correct module_node
-    4. return the top-level module_node list
-    """
-    # Map from top-level module name to ModuleNode
-    top_modules: dict[str, ModuleNode] = {}
-    # For nodes without module path, collect separately
-    root_level_nodes = []
-
-    def get_or_create(child_name: str, parent: ModuleNode) -> ModuleNode:
-        for m in parent.modules:
-            if m.name == child_name:
-                return m
-        # derive fullname from parent
-        parent_full = parent.fullname
-        fullname = child_name if not parent_full or parent_full == "__root__" else f"{parent_full}.{child_name}"
-        new_node = ModuleNode(name=child_name, fullname=fullname, schema_nodes=[], modules=[])
-        parent.modules.append(new_node)
-        return new_node
-
-    for sn in schema_nodes:
-        module_path = sn.module or ""
-        if not module_path:
-            root_level_nodes.append(sn)
-            continue
-        parts = module_path.split('.')
-        top_name = parts[0]
-        if top_name not in top_modules:
-            top_modules[top_name] = ModuleNode(name=top_name, fullname=top_name, schema_nodes=[], modules=[])
-        current = top_modules[top_name]
-        for part in parts[1:]:
-            current = get_or_create(part, current)
-        current.schema_nodes.append(sn)
-
-    # If there are root-level nodes, add a pseudo-module named "__root__"
-    result = list(top_modules.values())
-    if root_level_nodes:
-        result.append(ModuleNode(name="__root__", fullname="__root__", schema_nodes=root_level_nodes, modules=[]))
-
-    # Collapse pass: if a module has exactly one child module and no schema_nodes,
-    # merge it upward (A + B -> A.B). Repeat until fixed point.
-    def collapse(node: ModuleNode):
-        # Collapse chains at current node
-        while len(node.modules) == 1 and len(node.schema_nodes) == 0:
-            child = node.modules[0]
-            # Merge child's identity into current node
-            node.name = f"{node.name}.{child.name}"
-            # Prefer child's fullname which already reflects full path
-            node.fullname = child.fullname
-            node.schema_nodes = child.schema_nodes
-            node.modules = child.modules
-        # Recurse into children
-        for m in node.modules:
-            collapse(m)
-
-    for top in result:
-        collapse(top)
-
-    return result