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

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-voyager
-Version: 0.5.1
+Version: 0.5.2
 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

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

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

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

@@ -182,6 +182,8 @@ class Voyager:
         update_forward_refs(schema)
         self.add_to_node_set(schema)
 
+        base_fields = set()
+
         # handle schema inside ensure_subset(schema)
         if subset_reference := getattr(schema,  const.ENSURE_SUBSET_REFERENCE, None):
             if is_inheritance_of_pydantic_base(subset_reference):
@@ -198,6 +200,12 @@ class Voyager:
         # handle bases
         for base_class in schema.__bases__:
             if is_inheritance_of_pydantic_base(base_class):
+                # collect base class field names to avoid duplicating inherited fields
+                try:
+                    base_fields.update(getattr(base_class, 'model_fields', {}).keys())
+                except Exception:
+                    # be defensive in case of unconventional BaseModel subclasses
+                    pass
                 self.add_to_node_set(base_class)
                 self.add_to_link_set(
                     source=self.generate_node_head(full_class_name(schema)),
@@ -209,6 +217,9 @@ class Voyager:
 
         # handle fields
         for k, v in schema.model_fields.items():
+            # skip fields inherited from base classes
+            if k in base_fields:
+                continue
             annos = get_core_types(v.annotation)
             for anno in annos:
                 if anno and is_inheritance_of_pydantic_base(anno):

fastapi_voyager-0.5.2/src/fastapi_voyager/web/component/render-graph.js

@@ -0,0 +1,87 @@
+import { GraphUI } from "../graph-ui.js";
+const { defineComponent, ref, onMounted, nextTick } = window.Vue;
+
+export default defineComponent({
+	name: "RenderGraph",
+	props: {
+		coreData: { type: [Object, Array], required: false, default: null },
+	},
+	emits: ["close"],
+	setup(props, { emit }) {
+		const containerId = `graph-render-${Math.random().toString(36).slice(2, 9)}`;
+		const hasRendered = ref(false);
+		const loading = ref(false);
+		let graphInstance = null;
+
+		async function ensureGraph() {
+			await nextTick();
+			if (!graphInstance) {
+				graphInstance = new GraphUI(`#${containerId}`);
+			}
+		}
+
+		async function renderFromDot(dotText) {
+			if (!dotText) return;
+			await ensureGraph();
+			await graphInstance.render(dotText);
+			hasRendered.value = true;
+		}
+
+		async function renderFromCoreData() {
+			if (!props.coreData) return;
+			loading.value = true;
+			try {
+				const res = await fetch("/dot-render-core-data", {
+					method: "POST",
+					headers: { "Content-Type": "application/json" },
+					body: JSON.stringify(props.coreData),
+				});
+				const dotText = await res.text();
+				await renderFromDot(dotText);
+				if (window.Quasar?.Notify) {
+					window.Quasar.Notify.create({ type: "positive", message: "Rendered" });
+				}
+			} catch (e) {
+				console.error("Render from core data failed", e);
+				if (window.Quasar?.Notify) {
+					window.Quasar.Notify.create({ type: "negative", message: "Render failed" });
+				}
+			} finally {
+				loading.value = false;
+			}
+		}
+
+		async function reload() {
+			await renderFromCoreData();
+		}
+
+		onMounted(async () => {
+			await reload();
+		});
+
+		function close() {
+			emit("close");
+		}
+
+		return { containerId, close, hasRendered, reload, loading };
+	},
+	template: `
+		<div style="height:100%; position:relative; background:#fff;">
+			<q-btn
+				flat dense round icon="close"
+				aria-label="Close"
+				@click="close"
+				style="position:absolute; top:6px; right:6px; z-index:11; background:rgba(255,255,255,0.85);"
+			/>
+			<q-btn
+				flat dense round icon="refresh"
+				aria-label="Reload"
+				:loading="loading"
+				@click="reload"
+				style="position:absolute; top:6px; right:46px; z-index:11; background:rgba(255,255,255,0.85);"
+			/>
+			<div :id="containerId" style="width:100%; height:100%; overflow:auto; background:#fafafa"></div>
+		</div>
+	`,
+});
+

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

@@ -250,7 +250,7 @@
 
       <!-- Render Graph Dialog (from imported core data) -->
       <q-dialog v-model="showRenderGraph" :maximized="true" :persistent="false">
-        <render-graph :dot="renderDotString" @close="showRenderGraph = false" />
+        <render-graph :core-data="renderCoreData" @close="showRenderGraph = false" />
       </q-dialog>
 
       <div id="graph" style="width: 100%; flex: 1 1 auto; overflow: auto"></div>

{fastapi_voyager-0.5.1 → fastapi_voyager-0.5.2}/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 renderDotString = ref("");
+  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("");
@@ -222,19 +222,10 @@ const app = createApp({
         }
         return;
       }
-      try {
-        const res = await fetch("/dot-render-core-data", {
-          method: "POST",
-          headers: { "Content-Type": "application/json" },
-          body: JSON.stringify(payloadObj),
-        });
-        const dotText = await res.text();
-        renderDotString.value = dotText;
-        showRenderGraph.value = true;
-        showImportDialog.value = false;
-      } catch (e) {
-        console.error("Import render failed", e);
-      }
+      // Move the request into RenderGraph component: pass the parsed object and let the component call /dot-render-core-data
+      renderCoreData.value = payloadObj;
+      showRenderGraph.value = true;
+      showImportDialog.value = false;
     }
 
     function showDialog() {
@@ -290,7 +281,7 @@ const app = createApp({
       onImportConfirm,
       // render graph dialog
       showRenderGraph,
-      renderDotString,
+      renderCoreData,
     };
   },
 });

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

@@ -48,10 +48,12 @@ class PageSprint(serv.Sprint):
 class PageOverall(BaseModel):
     sprints: list[PageSprint]
 
+class PageOverallWrap(PageOverall):
+    content: str
 
-@app.get("/page_overall", tags=['for-page'], response_model=PageOverall)
+@app.get("/page_overall", tags=['for-page'], response_model=PageOverallWrap)
 async def get_page_info():
-    page_overall = PageOverall(sprints=[]) # focus on schema only
+    page_overall = PageOverallWrap(content="Page Overall Content", sprints=[]) # focus on schema only
     return await Resolver().resolve(page_overall)
 
 

fastapi_voyager-0.5.1/src/fastapi_voyager/web/component/render-graph.js

@@ -1,59 +0,0 @@
-import { GraphUI } from "../graph-ui.js";
-const { defineComponent, ref, onMounted, watch, nextTick } = window.Vue;
-
-// Simple dialog-embeddable component that renders a DOT graph.
-// Props:
-//  - dot: String (required) the DOT source to render
-// Emits:
-//  - close: when the close button is clicked
-export default defineComponent({
-	name: "RenderGraph",
-	props: {
-		dot: { type: String, required: true },
-	},
-	emits: ["close"],
-	setup(props, { emit }) {
-		const containerId = `graph-render-${Math.random().toString(36).slice(2, 9)}`;
-		const hasRendered = ref(false);
-		let graphInstance = null;
-
-		async function renderDot() {
-			if (!props.dot) return;
-			await nextTick();
-			if (!graphInstance) {
-				graphInstance = new GraphUI(`#${containerId}`);
-			}
-			await graphInstance.render(props.dot);
-			hasRendered.value = true;
-		}
-
-		onMounted(async () => {
-			await renderDot();
-		});
-
-		watch(
-			() => props.dot,
-			async () => {
-				await renderDot();
-			}
-		);
-
-		function close() {
-			emit("close");
-		}
-
-		return { containerId, close, hasRendered };
-	},
-	template: `
-		<div style="height:100%; position:relative; background:#fff;">
-			<q-btn
-				flat dense round icon="close"
-				aria-label="Close"
-				@click="close"
-				style="position:absolute; top:6px; right:6px; z-index:11; background:rgba(255,255,255,0.85);"
-			/>
-			<div :id="containerId" style="width:100%; height:100%; overflow:auto; background:#fafafa"></div>
-		</div>
-	`,
-});
-