fastapi-voyager 0.5.1__py3-none-any.whl → 0.5.2__py3-none-any.whl

fastapi_voyager/version.py

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

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/web/component/render-graph.js

@@ -1,48 +1,69 @@
 import { GraphUI } from "../graph-ui.js";
-const { defineComponent, ref, onMounted, watch, nextTick } = window.Vue;
+const { defineComponent, ref, onMounted, 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 },
+		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 renderDot() {
-			if (!props.dot) return;
+		async function ensureGraph() {
 			await nextTick();
 			if (!graphInstance) {
 				graphInstance = new GraphUI(`#${containerId}`);
 			}
-			await graphInstance.render(props.dot);
+		}
+
+		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 renderDot();
+			await reload();
 		});
 
-		watch(
-			() => props.dot,
-			async () => {
-				await renderDot();
-			}
-		);
-
 		function close() {
 			emit("close");
 		}
 
-		return { containerId, close, hasRendered };
+		return { containerId, close, hasRendered, reload, loading };
 	},
 	template: `
 		<div style="height:100%; position:relative; background:#fff;">
@@ -52,6 +73,13 @@ export default defineComponent({
 				@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/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/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.dist-info → fastapi_voyager-0.5.2.dist-info}/METADATA

@@ -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.dist-info → fastapi_voyager-0.5.2.dist-info}/RECORD

@@ -6,16 +6,16 @@ fastapi_voyager/render.py,sha256=gK0ur8CAqI3jNt2H3mr-JSpC0sD1JxzLRlFcuykBkxQ,636
 fastapi_voyager/server.py,sha256=Eer6GdD9-EG9QGHlYmClF3MeVxw68amjK4iW_YZ5ShI,3751
 fastapi_voyager/type.py,sha256=Tef61aKaQdTinM8N_lpmrse8elXV8DAgY3ULySc8TEE,1642
 fastapi_voyager/type_helper.py,sha256=j7AiFXsfl4kaxshYtofbsqo08dIXiHvJ190soIzUdLk,8380
-fastapi_voyager/version.py,sha256=KuUsLbsba6ZKn4IW2EH9junXCihYukG7hMgo1ojf5as,48
-fastapi_voyager/voyager.py,sha256=xreK0tuwx1WBme4e9-YX7j92oRPpaAdY9Wh4MHu0Yhk,9626
+fastapi_voyager/version.py,sha256=m_MOw_nkKIsJaKLUdJmlCrDGyTqN5GYwGMjdFF2hZmo,48
+fastapi_voyager/voyager.py,sha256=InAAc_Sf1blM8X-KjF_x-CdS4OEpN-z0doMiBgnl0-A,10103
 fastapi_voyager/web/graph-ui.js,sha256=eEjDnJVMvk35LdRoxcqX_fZxLFS9_bUrGAZL6K2O5C0,4176
 fastapi_voyager/web/graphviz.svg.css,sha256=zDCjjpT0Idufu5YOiZI76PL70-avP3vTyzGPh9M85Do,1563
 fastapi_voyager/web/graphviz.svg.js,sha256=lvAdbjHc-lMSk4GQp-iqYA2PCFX4RKnW7dFaoe0LUHs,16005
-fastapi_voyager/web/index.html,sha256=zIihJ0S-adznFDbtoFa0cbXuP6viqZ0UtgsZWH8YSRY,10456
+fastapi_voyager/web/index.html,sha256=vndU6K9BN5f75OMPPPzREF7xACmf31wTVyGuOYksiys,10461
 fastapi_voyager/web/quasar.min.css,sha256=F5jQe7X2XT54VlvAaa2V3GsBFdVD-vxDZeaPLf6U9CU,203145
 fastapi_voyager/web/quasar.min.js,sha256=h0ftyPMW_CRiyzeVfQqiup0vrVt4_QWojpqmpnpn07E,502974
-fastapi_voyager/web/vue-main.js,sha256=k_3SX5VHtJhtXzXEqFsB0maSJH0ljFSx7i-X4Vq40AY,9012
-fastapi_voyager/web/component/render-graph.js,sha256=5BdxBOWsSxWUR5tha5zEQh8eojBZjQ_vGawZFC9WNa8,1450
+fastapi_voyager/web/vue-main.js,sha256=tW0jRSSABMmnAqLDaIXMeXQBm0WWOKycsYesgg8ArZw,8798
+fastapi_voyager/web/component/render-graph.js,sha256=8jfN-ik7Ckn5Frx01umjlYqP6i0HELDCcWQMp5zbIhI,2323
 fastapi_voyager/web/component/route-code-display.js,sha256=NECC1OGcPCdDfbghtRJEnmFM6HmH5J3win2ibapWPeA,2649
 fastapi_voyager/web/component/schema-code-display.js,sha256=oOusgTvCaWGnoKb-NBwu0SXqJJf2PTUtp3lUczokTBM,5515
 fastapi_voyager/web/component/schema-field-filter.js,sha256=9WBjO6JJl2yf6OiiXoddMgvL32qTDu0PM-RxkkJ7t5M,6267
@@ -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.5.1.dist-info/METADATA,sha256=KMBZwza3Z2hhpS1HK8WxoVBntmYEkmP0EAofWiYa2x0,6766
-fastapi_voyager-0.5.1.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-fastapi_voyager-0.5.1.dist-info/entry_points.txt,sha256=pEIKoUnIDXEtdMBq8EmXm70m16vELIu1VPz9-TBUFWM,53
-fastapi_voyager-0.5.1.dist-info/licenses/LICENSE,sha256=lNVRR3y_bFVoFKuK2JM8N4sFaj3m-7j29kvL3olFi5Y,1067
-fastapi_voyager-0.5.1.dist-info/RECORD,,
+fastapi_voyager-0.5.2.dist-info/METADATA,sha256=emxagsUfAuI44P9Q0D3SMj3tkdZFNPD8UD_Ok3jscXA,6766
+fastapi_voyager-0.5.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+fastapi_voyager-0.5.2.dist-info/entry_points.txt,sha256=pEIKoUnIDXEtdMBq8EmXm70m16vELIu1VPz9-TBUFWM,53
+fastapi_voyager-0.5.2.dist-info/licenses/LICENSE,sha256=lNVRR3y_bFVoFKuK2JM8N4sFaj3m-7j29kvL3olFi5Y,1067
+fastapi_voyager-0.5.2.dist-info/RECORD,,