fastapi-voyager 0.12.9__py3-none-any.whl → 0.12.11__py3-none-any.whl

fastapi_voyager/render.py

@@ -57,7 +57,7 @@ class Renderer:
         header_color = 'tomato' if node.id == self.schema else default_color
         header = f"""<tr><td cellpadding="6" bgcolor="{header_color}" align="center" colspan="1" port="{PK}"> <font color="white">    {node.name}    </font></td> </tr>"""
         field_content = ''.join(fields_parts) if fields_parts else ''
-        return f"""<<table border="1" cellborder="0" cellpadding="0" bgcolor="white"> {header} {field_content}   </table>>"""
+        return f"""<<table border="0" cellborder="1" cellpadding="0" cellspacing="0" bgcolor="white"> {header} {field_content}   </table>>"""
 
     def _handle_schema_anchor(self, source: str) -> str:
         if '::' in source:

fastapi_voyager/version.py

@@ -1,2 +1,2 @@
 __all__ = ["__version__"]
-__version__ = "0.12.9"
+__version__ = "0.12.11"

fastapi_voyager/web/graph-ui.js

@@ -91,7 +91,13 @@ export class GraphUI {
       ready: function () {
         self.gv = this;
 
-        self.gv.nodes().dblclick(function (event) {
+        const nodes = self.gv.nodes();
+        const edges = self.gv.edges();
+
+        nodes.off(".graphui");
+        edges.off(".graphui");
+
+        nodes.on("dblclick.graphui", function (event) {
           event.stopPropagation();
           try {
             self.highlightSchemaBanner(this)
@@ -110,7 +116,7 @@ export class GraphUI {
           }
         });
 
-        self.gv.edges().click(function (event) {
+        edges.on("click.graphui", function (event) {
           const up = $();
           const down = $();
           const edge = $();
@@ -127,13 +133,14 @@ export class GraphUI {
           self._highlightEdgeNodes();
         })
 
-        self.gv.nodes().click(function (event) {
+        nodes.on("click.graphui", function (event) {
           const set = $();
           set.push(this);
           const obj = { set, direction: "bidirectional" };
 
           const schemaName = event.currentTarget.dataset.name;
-          if (event.shiftKey && self.options.onSchemaClick) {
+          console.log("shift click detected");
+          if (event.shiftKey && self.options.onSchemaShiftClick) {
             if (schemaName) {
               try {
                 self.options.onSchemaShiftClick(schemaName);

fastapi_voyager/web/index.html

@@ -158,7 +158,16 @@
                 @update:model-value="onSearchSchemaChange"
                 @filter="filterSearchSchemas"
                 @clear="resetSearch"
-              ></q-select>
+              >
+               <template v-slot:option="scope">
+                <q-item v-bind="scope.itemProps">
+                  <q-item-section>
+                    <q-item-label>{{ scope.opt.label }}</q-item-label>
+                    <q-item-label caption>{{ scope.opt.desc }}</q-item-label>
+                  </q-item-section>
+                </q-item>
+              </template>
+            </q-select>
               
               <q-select
                 dense
@@ -272,7 +281,6 @@
                       expand-separator
                       :model-value="store.state.leftPanel._tag === tag.name || store.state.search.mode"
                       @update:model-value="(val) => toggleTag(tag.name, val)"
-                      @click="() => toggleTag(tag.name, true)"
                       :header-class="store.state.leftPanel.tag === tag.name ? 'text-primary text-bold tag-bg' : 'tag-bg'"
                       content-class="q-pa-none"
                     >

fastapi_voyager/web/store.js

@@ -9,6 +9,12 @@ const state = reactive({
     config: {
         initial_page_policy: 'first'
     },
+    
+    previousTagRoute: {  // for shift + click, store previous tag/route, and populate back when needed
+        hasValue: false,
+        tag: null,
+        routeId: null
+    },
 
     swagger: {
         url: ''

fastapi_voyager/web/vue-main.js

@@ -12,14 +12,11 @@ const app = createApp({
     let graphUI = null;
     const allSchemaOptions = ref([]);
 
-    const NBSP = String.fromCharCode(160);
-    const formatSchemaLabel = (name, id) =>
-      `${name}${NBSP}${NBSP}${NBSP}-${NBSP}${NBSP}${NBSP}${id}`;
-
     function rebuildSchemaOptions() {
       const dict = store.state.graph.schemaMap || {};
       const opts = Object.values(dict).map((s) => ({
-        label: formatSchemaLabel(s.name, s.id),
+        label: s.name,
+        desc: s.id,
         value: s.id,
       }));
       allSchemaOptions.value = opts;
@@ -64,7 +61,11 @@ const app = createApp({
     function onSearchSchemaChange(val) {
       store.state.search.schemaName = val;
       store.state.search.mode = false;
-      onSearch()
+      if (!val) {
+        // Clearing the select should only run resetSearch via @clear
+        return;
+      }
+      onSearch();
     }
 
     function readQuerySelection() {
@@ -132,9 +133,19 @@ const app = createApp({
 
     async function resetSearch() {
       store.state.search.mode = false;
-      store.state.leftPanel.tag = null;
-      store.state.leftPanel._tag = null;
-      store.state.leftPanel.routeId = null;
+      console.log(store.state.previousTagRoute.hasValue)
+      console.log(store.state.previousTagRoute)
+      if (store.state.previousTagRoute.hasValue) {
+        store.state.leftPanel.tag = store.state.previousTagRoute.tag;
+        store.state.leftPanel._tag = store.state.previousTagRoute.tag;
+        store.state.leftPanel.routeId = store.state.previousTagRoute.routeId;
+        store.state.previousTagRoute.hasValue = false;
+      } else {
+        store.state.leftPanel.tag = null;
+        store.state.leftPanel._tag = null;
+        store.state.leftPanel.routeId = null;
+      }
+
       syncSelectionToUrl()
       await loadSearchedTags();
       renderBasedOnInitialPolicy()
@@ -270,12 +281,19 @@ const app = createApp({
           graphUI = new GraphUI("#graph", {
             onSchemaShiftClick: (id) => {
               if (store.state.graph.schemaKeys.has(id)) {
+
+                console.log(store.state.leftPanel)
+                store.state.previousTagRoute.tag = store.state.leftPanel.tag;
+                store.state.previousTagRoute.routeId = store.state.leftPanel.routeId;
+                store.state.previousTagRoute.hasValue = true;
+
                 store.state.search.mode = true;
                 store.state.search.schemaName = id;
                 onSearch();
               }
             },
             onSchemaClick: (id) => {
+              console.log("schema clicked:", id);
               resetDetailPanels();
               if (store.state.graph.schemaKeys.has(id)) {
                 store.state.schemaDetail.schemaCodeName = id;
@@ -314,7 +332,7 @@ const app = createApp({
     }
 
     function toggleTag(tagName, expanded = null) {
-      if (expanded === true) {
+      if (expanded === true || store.state.search.mode === true) {
         store.state.leftPanel._tag = tagName;
         store.state.leftPanel.tag = tagName;
         store.state.leftPanel.routeId = "";
@@ -331,16 +349,24 @@ const app = createApp({
     }
 
     function selectRoute(routeId) {
+      // find belonging tag
+      const belongingTag = findTagByRoute(routeId);
+      if (belongingTag) {
+        store.state.leftPanel.tag = belongingTag;
+        store.state.leftPanel._tag = belongingTag;
+      }
+
       if (store.state.leftPanel.routeId === routeId) {
         store.state.leftPanel.routeId = "";
       } else {
         store.state.leftPanel.routeId = routeId;
       }
+
       store.state.rightDrawer.drawer = false;
       store.state.routeDetail.show = false;
       store.state.schemaDetail.schemaCodeName = "";
-      onGenerate();
       syncSelectionToUrl();
+      onGenerate();
     }
 
     function toggleShowModule(val) {

{fastapi_voyager-0.12.9.dist-info → fastapi_voyager-0.12.11.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-voyager
-Version: 0.12.9
+Version: 0.12.11
 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
@@ -31,7 +31,6 @@ Description-Content-Type: text/markdown
 [![PyPI Downloads](https://static.pepy.tech/badge/fastapi-voyager/month)](https://pepy.tech/projects/fastapi-voyager)
 
 
-
 Visualize your FastAPI endpoints, and explore them interactively.
 
 > This repo is still in early stage, it supports pydantic v2 only
@@ -49,7 +48,7 @@ app.mount('/voyager',
             module_color={'src.services': 'tomato'}, 
             module_prefix='src.services', 
             swagger_url="/docs",
-            ga_id="G-R64S7Q49VL",
+            ga_id="G-XXXXXXXXVL",
             initial_page_policy='first',
             online_repo_url='https://github.com/allmonday/composition-oriented-development-pattern/blob/master'))
 ```

{fastapi_voyager-0.12.9.dist-info → fastapi_voyager-0.12.11.dist-info}/RECORD

@@ -2,20 +2,20 @@ fastapi_voyager/__init__.py,sha256=kqwzThE1YhmQ_7jPKGlnWvqRGC-hFrRqq_lKhKaleYU,2
 fastapi_voyager/cli.py,sha256=td3yIIigEomhSdDO-Xkh-CgpEwCafwlwnpvxnT9QsBo,10488
 fastapi_voyager/filter.py,sha256=AN_HIu8-DtKisIq5mFt7CnqRHtxKewedNGyyaI82hSY,11529
 fastapi_voyager/module.py,sha256=h9YR3BpS-CAcJW9WCdVkF4opqwY32w9T67g9GfdLytk,3425
-fastapi_voyager/render.py,sha256=7jSChISqTV2agaO55thhwyrOhqVOMux4x7k8rSQROnU,9960
+fastapi_voyager/render.py,sha256=O_HR8ypOrFhjejkBpKIH_8foB78DgzH0hvO-CWeYt0w,9976
 fastapi_voyager/server.py,sha256=wwCFl1eeq_jn8nfIwcy7s8Sh6MB55SN8u9AsJRnkFWQ,7979
 fastapi_voyager/type.py,sha256=7EL1zaIwKVRGpLig7fqaOrZGN5k0Rm31C9COfck3CSs,1750
 fastapi_voyager/type_helper.py,sha256=UTCFWluFeGdGkJX3wiE_bZ2EgZsu4JkmqHjsJVdG81Q,9953
-fastapi_voyager/version.py,sha256=zqg8eyYmMv7qmhNprlm0Gp1wy1_Md8MuU6RGjhIE1LQ,49
+fastapi_voyager/version.py,sha256=YNroKDVY4KuIpPNPQwev35dx9wIdzbqUsl6fQBE7haU,50
 fastapi_voyager/voyager.py,sha256=qJZvkLh5W_18X5B4pJ8XYbytx2Wvcz-0OnYoHWw8XlA,14046
-fastapi_voyager/web/graph-ui.js,sha256=wxKjmVEpaMJZXMTW7tJ4BiaACCI1oVN6cx7hSMI0K5U,6428
+fastapi_voyager/web/graph-ui.js,sha256=hTsZO1Ly1JuoRg0kZWQ62jeLiD2kbnzACfbSPd0F95U,6634
 fastapi_voyager/web/graphviz.svg.css,sha256=zDCjjpT0Idufu5YOiZI76PL70-avP3vTyzGPh9M85Do,1563
 fastapi_voyager/web/graphviz.svg.js,sha256=wZwz_lBztoXmujEN21P0w-HMpdmbqPwTQQ6Ebxd9rGo,18569
-fastapi_voyager/web/index.html,sha256=gF73eTnh5M2PcjWFOsDzqvCQBdl4KpaZW28hjS0iJnM,18454
+fastapi_voyager/web/index.html,sha256=SNa6Vt3juCbRztA3ZH1PpJ0kW5fFSY1Mb0vVock2SOY,18774
 fastapi_voyager/web/quasar.min.css,sha256=F5jQe7X2XT54VlvAaa2V3GsBFdVD-vxDZeaPLf6U9CU,203145
 fastapi_voyager/web/quasar.min.js,sha256=h0ftyPMW_CRiyzeVfQqiup0vrVt4_QWojpqmpnpn07E,502974
-fastapi_voyager/web/store.js,sha256=ul6I00XqT9FByAD20JgO2mzdbYCZhTI-CP5t0g_k6yo,1776
-fastapi_voyager/web/vue-main.js,sha256=_yxkrWqxNIUMc3LMBi0TxT5SnDlV-_0n9tPaJdlwiFg,14064
+fastapi_voyager/web/store.js,sha256=eYKy5kuCa5weazb_qC6PvJhSunhQwjJdPuH8W7_qq_0,1957
+fastapi_voyager/web/vue-main.js,sha256=DFSje-Axno70B9NmmNAYhMsJU7YXZypz5hFdt3xcVK4,15061
 fastapi_voyager/web/component/demo.js,sha256=bQb16Un4XZ3Mf8qL6gvyrXe_mmA3V3mSIRMQAWg2MNk,352
 fastapi_voyager/web/component/render-graph.js,sha256=e8Xgh2Kl-nYU0P1gstEmAepCgFnk2J6UdxW8TlMafGs,2322
 fastapi_voyager/web/component/route-code-display.js,sha256=8NJPPjNRUC21gjpY8XYEQs4RBbhX1pCiqEhJp39ku6k,3678
@@ -27,8 +27,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.12.9.dist-info/METADATA,sha256=mwXk2O8gEasBEpci6RZagsLQ7rUGk7tRPvLfb-Q7bUg,6523
-fastapi_voyager-0.12.9.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-fastapi_voyager-0.12.9.dist-info/entry_points.txt,sha256=pEIKoUnIDXEtdMBq8EmXm70m16vELIu1VPz9-TBUFWM,53
-fastapi_voyager-0.12.9.dist-info/licenses/LICENSE,sha256=lNVRR3y_bFVoFKuK2JM8N4sFaj3m-7j29kvL3olFi5Y,1067
-fastapi_voyager-0.12.9.dist-info/RECORD,,
+fastapi_voyager-0.12.11.dist-info/METADATA,sha256=QxERp2EpXzxzknG0jX8dAVH3bhiMqwIpvUyFRfOXLXo,6523
+fastapi_voyager-0.12.11.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+fastapi_voyager-0.12.11.dist-info/entry_points.txt,sha256=pEIKoUnIDXEtdMBq8EmXm70m16vELIu1VPz9-TBUFWM,53
+fastapi_voyager-0.12.11.dist-info/licenses/LICENSE,sha256=lNVRR3y_bFVoFKuK2JM8N4sFaj3m-7j29kvL3olFi5Y,1067
+fastapi_voyager-0.12.11.dist-info/RECORD,,