fastapi-voyager 0.12.7__tar.gz → 0.12.9__tar.gz

{fastapi_voyager-0.12.7 → fastapi_voyager-0.12.9}/PKG-INFO

@@ -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 → fastapi_voyager-0.12.9}/docs/changelog.md

@@ -122,6 +122,11 @@
 - 0.12.7
     - [x] remove search component, integrated into main page
 - 0.12.8
+    - [x] optimize ui elements, change icons, update reset behavior
+- 0.12.9
+    - [x] fix: handle logging exception for forward ref info, preventing crash
+- 0.12.10
+    - [ ] fix: pick tag and then pick route directly from another tag will render nothing
     - [ ] refactor vue-main.js, move methods to store
     - [ ] refactor render.py
 

{fastapi_voyager-0.12.7 → fastapi_voyager-0.12.9}/src/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-0.12.7 → fastapi_voyager-0.12.9}/src/fastapi_voyager/version.py

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

{fastapi_voyager-0.12.7 → fastapi_voyager-0.12.9}/src/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-0.12.7 → fastapi_voyager-0.12.9}/src/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 → fastapi_voyager-0.12.9}/tests/programatic.py

@@ -1,12 +1,12 @@
 from fastapi_voyager import create_voyager
-# from tests.demo_anno import app
-from tests.demo import app
+from tests.demo_anno import app
+# from tests.demo import app
 
 app.mount(
     '/voyager', 
     create_voyager(
         app, 
-        module_color={"tests.service": "purple", "tests.demo": "#00b1cc", "tests": "green"}, 
+        module_color={"tests.service": "purple"}, 
         module_prefix="tests.service", 
         swagger_url="/docs",
         initial_page_policy='first',