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

fastapi_voyager/type_helper.py

@@ -2,7 +2,7 @@ import inspect
 import logging
 import os
 from types import UnionType
-from typing import Annotated, Any, Generic, Union, get_args, get_origin
+from typing import Annotated, Any, Generic, Union, get_args, get_origin, ForwardRef
 
 import pydantic_resolve.constant as const
 from pydantic import BaseModel
@@ -237,7 +237,11 @@ def safe_issubclass(kls, target_kls):
     try:
         return issubclass(kls, target_kls)
     except TypeError:
-        logger.debug(f'{kls.__module__}:{kls.__qualname__} is not subclass of {target_kls.__module__}:{target_kls.__qualname__}')  
+        # if kls is ForwardRef, log it
+        if isinstance(kls, ForwardRef):
+            logger.error(f'{str(kls)} is a ForwardRef, not a subclass of {target_kls.__module__}:{target_kls.__qualname__}')
+        else:
+            logger.debug(f'{kls.__module__}:{kls.__qualname__} is not subclass of {target_kls.__module__}:{target_kls.__qualname__}')  
         return False
 
 

fastapi_voyager/version.py

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

fastapi_voyager/web/index.html

@@ -55,6 +55,12 @@
       flex: 1 1 auto;
       overflow: auto;
     }
+    .tag-bg {
+      /* background-color: #287e75; */
+      /* border-bottom: 2px solid #009485;
+      border-left: 2px solid #009485;
+      border-top: 0; */
+    }
 
     .adjust-fit {
       height: calc(100vh - 54px);
@@ -107,9 +113,20 @@
               <span> FastAPI Voyager </span>
               <span v-if="store.state.version" style="font-size: 12px; margin-left: 8px; font-weight: normal;">{{ store.state.version }}</span>
             </div>
+            <div class="col-auto">
+              <q-btn
+                style="margin-left: 80px"
+                outline
+                @click="onReset"
+                title="clear tag, route selection"
+                icon="open_in_full"
+                color="primary"
+                flat
+                class="q-mx-md"
+              />
+            </div>
             <div class="col-auto" style="font-size: 16px">
               <q-option-group
-                style="margin-left: 80px"
                 v-model="store.state.filter.showFields"
                 :options="store.state.fieldOptions"
                 @update:model-value="(val) => toggleShowField(val)"
@@ -149,28 +166,11 @@
                 v-model="store.state.search.fieldName"
                 :disable="!store.state.search.schemaName || store.state.search.fieldOptions.length===0"
                 :options="store.state.search.fieldOptions"
+                @update:model-value="onSearch"
                 style="min-width: 180px"
                 clearable
                 label="Select field (optional)"
               ></q-select>
-              <q-btn
-                outline
-                icon="search"
-                flat
-                class="q-mr-none"
-                :disable="!store.state.search.schemaName"
-                :loading="store.state.generating"
-                @click="onSearch"
-              ></q-btn>
-              <q-btn
-                outline
-                @click="onReset"
-                dense
-                title="full graph"
-                icon="border_all"
-                flat
-                class="q-mr-sm"
-              />
             </div>
             <div class="col-auto">
               <q-btn
@@ -179,7 +179,7 @@
                 flat
                 icon="help_outline"
                 aria-label="Help"
-                style="margin-right: 40px"
+                style="margin-right: 50px; margin-left: 20px"
               >
                 <q-tooltip
                   anchor="bottom middle"
@@ -272,7 +272,8 @@
                       expand-separator
                       :model-value="store.state.leftPanel._tag === tag.name || store.state.search.mode"
                       @update:model-value="(val) => toggleTag(tag.name, val)"
-                      :header-class="store.state.leftPanel.tag === tag.name ? 'text-primary text-bold' : ''"
+                      @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"
                     >
                       <template #header>

fastapi_voyager/web/vue-main.js

@@ -64,6 +64,7 @@ const app = createApp({
     function onSearchSchemaChange(val) {
       store.state.search.schemaName = val;
       store.state.search.mode = false;
+      onSearch()
     }
 
     function readQuerySelection() {
@@ -134,15 +135,18 @@ const app = createApp({
       store.state.leftPanel.tag = null;
       store.state.leftPanel._tag = null;
       store.state.leftPanel.routeId = null;
+      syncSelectionToUrl()
       await loadSearchedTags();
       renderBasedOnInitialPolicy()
     }
 
     async function onSearch() {
+      console.log('start search')
       store.state.search.mode = true;
       store.state.leftPanel.tag = null;
       store.state.leftPanel._tag = null;
       store.state.leftPanel.routeId = null;
+      syncSelectionToUrl()
       await loadSearchedTags();
       await onGenerate();
     }
@@ -203,9 +207,10 @@ const app = createApp({
           syncSelectionToUrl();
           onGenerate();
           return;
+        } else {
+          store.state.config.initial_page_policy = data.initial_page_policy
+          renderBasedOnInitialPolicy()
         }
-        store.state.config.initial_page_policy = data.initial_page_policy
-        renderBasedOnInitialPolicy()
 
         // default route options placeholder
       } catch (e) {
@@ -228,6 +233,7 @@ const app = createApp({
                 ? store.state.leftPanel.tags[0].name
                 : null;
             store.state.leftPanel._tag = store.state.leftPanel.tag;
+            syncSelectionToUrl()
             onGenerate();
             return;
         }
@@ -300,20 +306,11 @@ const app = createApp({
     }
 
     async function onReset() {
-      store.state.leftPanel.tag = null;
-      store.state.leftPanel._tag = null;
-      store.state.leftPanel.routeId = null;
-
-      store.state.graph.schemaId = null;
-
-      store.state.search.mode = false;
-      store.state.search.schemaName = null;
-      store.state.search.fieldName = null;
-      store.state.search.fieldOptions = [];
-      store.state.search.schemaOptions = allSchemaOptions.value.slice();
-
-      store.state.schemaDetail.schemaCodeName = "";
-      resetSearch()
+        store.state.leftPanel.tag = null;
+        store.state.leftPanel._tag = null;
+        store.state.leftPanel.routeId = null;
+        syncSelectionToUrl()
+        onGenerate()
     }
 
     function toggleTag(tagName, expanded = null) {

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-voyager
-Version: 0.12.7
+Version: 0.12.9
 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.12.7.dist-info → fastapi_voyager-0.12.9.dist-info}/RECORD

@@ -5,17 +5,17 @@ fastapi_voyager/module.py,sha256=h9YR3BpS-CAcJW9WCdVkF4opqwY32w9T67g9GfdLytk,342
 fastapi_voyager/render.py,sha256=7jSChISqTV2agaO55thhwyrOhqVOMux4x7k8rSQROnU,9960
 fastapi_voyager/server.py,sha256=wwCFl1eeq_jn8nfIwcy7s8Sh6MB55SN8u9AsJRnkFWQ,7979
 fastapi_voyager/type.py,sha256=7EL1zaIwKVRGpLig7fqaOrZGN5k0Rm31C9COfck3CSs,1750
-fastapi_voyager/type_helper.py,sha256=JXD_OE_xTARkGjWDsnO_xfvyZ0vcwViYyqCp6oEHBTM,9719
-fastapi_voyager/version.py,sha256=z8XZy0W66ufD2jmi9zvVlH2vjRJoy4CC-ZR7EhfBej8,49
+fastapi_voyager/type_helper.py,sha256=UTCFWluFeGdGkJX3wiE_bZ2EgZsu4JkmqHjsJVdG81Q,9953
+fastapi_voyager/version.py,sha256=zqg8eyYmMv7qmhNprlm0Gp1wy1_Md8MuU6RGjhIE1LQ,49
 fastapi_voyager/voyager.py,sha256=qJZvkLh5W_18X5B4pJ8XYbytx2Wvcz-0OnYoHWw8XlA,14046
 fastapi_voyager/web/graph-ui.js,sha256=wxKjmVEpaMJZXMTW7tJ4BiaACCI1oVN6cx7hSMI0K5U,6428
 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=L2xt6T-b4V6WnYnZ_MkmduDQLzFPxfRLhHuiaG9QnGU,18362
+fastapi_voyager/web/index.html,sha256=gF73eTnh5M2PcjWFOsDzqvCQBdl4KpaZW28hjS0iJnM,18454
 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=LoMVDcU4KSTw3mcquI3g3xJT8ChcQtiyC1rGV79tpUA,14208
+fastapi_voyager/web/vue-main.js,sha256=_yxkrWqxNIUMc3LMBi0TxT5SnDlV-_0n9tPaJdlwiFg,14064
 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.7.dist-info/METADATA,sha256=ZsBh0iYCI0KSjBlTW_WQuwBglfwNHpSIrjZee3u4eUg,6523
-fastapi_voyager-0.12.7.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
-fastapi_voyager-0.12.7.dist-info/entry_points.txt,sha256=pEIKoUnIDXEtdMBq8EmXm70m16vELIu1VPz9-TBUFWM,53
-fastapi_voyager-0.12.7.dist-info/licenses/LICENSE,sha256=lNVRR3y_bFVoFKuK2JM8N4sFaj3m-7j29kvL3olFi5Y,1067
-fastapi_voyager-0.12.7.dist-info/RECORD,,
+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,,