fastapi-voyager 0.13.3__tar.gz → 0.14.1__tar.gz

{fastapi_voyager-0.13.3 → fastapi_voyager-0.14.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: fastapi-voyager
-Version: 0.13.3
+Version: 0.14.1
 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
@@ -19,7 +19,7 @@ Classifier: Programming Language :: Python :: 3.13
 Classifier: Programming Language :: Python :: 3.14
 Requires-Python: >=3.10
 Requires-Dist: fastapi>=0.110
-Requires-Dist: pydantic-resolve>=2.2.3
+Requires-Dist: pydantic-resolve>=2.3.1
 Provides-Extra: dev
 Requires-Dist: pytest; extra == 'dev'
 Requires-Dist: ruff; extra == 'dev'
@@ -33,6 +33,8 @@ Description-Content-Type: text/markdown
 
 Visualize your FastAPI endpoints, and explore them interactively.
 
+Its vision is to make code easier to read and understand, serving as an ideal documentation tool.
+
 > This repo is still in early stage, it supports pydantic v2 only
 
 visit [live demo](https://www.newsyeah.fun/voyager/) 
@@ -51,7 +53,8 @@ app.mount('/voyager',
             swagger_url="/docs",
             ga_id="G-XXXXXXXXVL",
             initial_page_policy='first',
-            online_repo_url='https://github.com/allmonday/composition-oriented-development-pattern/blob/master'))
+            online_repo_url='https://github.com/allmonday/composition-oriented-development-pattern/blob/master',
+            enable_pydantic_resolve_meta=True))
 ```
 
 https://github.com/allmonday/composition-oriented-development-pattern/blob/master/src/main.py#L48
@@ -91,6 +94,7 @@ It is also an architecture tool that can identify issues inside implementation,
 
 Given ErDiagram defined by pydantic-resolve, application level entity relationship diagram can be visualized too.
 
+
 ### highlight nodes and links
 click a node to highlight it's upperstream and downstream nodes. figure out the related models of one page, or homw many pages are related with one model.
 
@@ -155,6 +159,11 @@ app.mount('/voyager',
 
 <img width="1276" height="613" alt="image" src="https://github.com/user-attachments/assets/ea0091bb-ee11-4f71-8be3-7129d956c910" />
 
+### Show pydantic resolve meta info
+
+setting `enable_pydantic_resolve_meta=True` in `create_voyager`, toggle `pydantic resolve meta`. 
+
+<img width="1604" height="535" alt="image" src="https://github.com/user-attachments/assets/d1639555-af41-4a08-9970-4b8ef314596a" />
 
 
 ## Command Line Usage
@@ -190,9 +199,9 @@ voyager --help
 
 ## About pydantic-resolve
 
-pydantic-resolve's `@ensure_subset` decorator helps safely pick fields from the 'source class' while **indicating the reference** from the current class to the base class.
+pydantic-resolve is a lightweight tool designed to build complex, nested data in a simple, declarative way. In v2 it introduced an important feature: ER Diagram, and fastapi-voyager has supported this feature, allowing for a clearer understanding of the business relationships.
 
-pydantic-resolve is a lightweight tool designed to build complex, nested data in a simple, declarative way. In version 2.0.0alpha, it will introduce an important feature: ER Diagram, and fastapi-voyager will support this feature, allowing for a clearer understanding of the business relationships between the data.
+pydantic-resolve's ~~`@ensure_subset` decorator~~ `DefineSubset` metaclass helps safely pick fields from the 'source class' while **indicating the reference** from the current class to the base class.
 
 Developers can use fastapi-voyager without needing to know anything about pydantic-resolve, but I still highly recommend everyone to give it a try.
 

{fastapi_voyager-0.13.3 → fastapi_voyager-0.14.1}/README.md

@@ -5,6 +5,8 @@
 
 Visualize your FastAPI endpoints, and explore them interactively.
 
+Its vision is to make code easier to read and understand, serving as an ideal documentation tool.
+
 > This repo is still in early stage, it supports pydantic v2 only
 
 visit [live demo](https://www.newsyeah.fun/voyager/) 
@@ -23,7 +25,8 @@ app.mount('/voyager',
             swagger_url="/docs",
             ga_id="G-XXXXXXXXVL",
             initial_page_policy='first',
-            online_repo_url='https://github.com/allmonday/composition-oriented-development-pattern/blob/master'))
+            online_repo_url='https://github.com/allmonday/composition-oriented-development-pattern/blob/master',
+            enable_pydantic_resolve_meta=True))
 ```
 
 https://github.com/allmonday/composition-oriented-development-pattern/blob/master/src/main.py#L48
@@ -63,6 +66,7 @@ It is also an architecture tool that can identify issues inside implementation,
 
 Given ErDiagram defined by pydantic-resolve, application level entity relationship diagram can be visualized too.
 
+
 ### highlight nodes and links
 click a node to highlight it's upperstream and downstream nodes. figure out the related models of one page, or homw many pages are related with one model.
 
@@ -127,6 +131,11 @@ app.mount('/voyager',
 
 <img width="1276" height="613" alt="image" src="https://github.com/user-attachments/assets/ea0091bb-ee11-4f71-8be3-7129d956c910" />
 
+### Show pydantic resolve meta info
+
+setting `enable_pydantic_resolve_meta=True` in `create_voyager`, toggle `pydantic resolve meta`. 
+
+<img width="1604" height="535" alt="image" src="https://github.com/user-attachments/assets/d1639555-af41-4a08-9970-4b8ef314596a" />
 
 
 ## Command Line Usage
@@ -162,9 +171,9 @@ voyager --help
 
 ## About pydantic-resolve
 
-pydantic-resolve's `@ensure_subset` decorator helps safely pick fields from the 'source class' while **indicating the reference** from the current class to the base class.
+pydantic-resolve is a lightweight tool designed to build complex, nested data in a simple, declarative way. In v2 it introduced an important feature: ER Diagram, and fastapi-voyager has supported this feature, allowing for a clearer understanding of the business relationships.
 
-pydantic-resolve is a lightweight tool designed to build complex, nested data in a simple, declarative way. In version 2.0.0alpha, it will introduce an important feature: ER Diagram, and fastapi-voyager will support this feature, allowing for a clearer understanding of the business relationships between the data.
+pydantic-resolve's ~~`@ensure_subset` decorator~~ `DefineSubset` metaclass helps safely pick fields from the 'source class' while **indicating the reference** from the current class to the base class.
 
 Developers can use fastapi-voyager without needing to know anything about pydantic-resolve, but I still highly recommend everyone to give it a try.
 

{fastapi_voyager-0.13.3 → fastapi_voyager-0.14.1}/docs/changelog.md

@@ -144,13 +144,21 @@
     - [x] show dashed line for link without dataloader
 - 0.13.3
     - [x] show field description
-- 0.13.4
-    - [ ] integration with pydantic-resolve
-        - [ ] show hint for resolve, post fields
-        - [ ] display loader as edges
-    - [ ] add tests
-- 0.13.5
+
+## 0.14, integration with pydantic-resolve
+- 0.14.0
+    - [x] show hint for resolve (>), post fields (<), post default handler (* at title)
+    - [x] show expose and collect info
+- 0.14.1
+    - [x] minor ui enhancement
+
+## 0.15, internal refactor
+- 0.15.0
+    - [ ] left panel can be toggled.
     - [ ] refactor vue-main.js, move methods to store
     - [ ] refactor render.py
+    - [ ] add tests
+
+## 1.0, release 
 
 

{fastapi_voyager-0.13.3 → fastapi_voyager-0.14.1}/docs/idea.md

@@ -14,8 +14,11 @@
 - [ ] set max limit for fields in nodes (? need further thinking)
 - [ ] minimap (good to have)
     - ref: https://observablehq.com/@rabelais/d3-js-zoom-minimap
-- [ ] debug mode
+- [ ] ~~debug mode~~
     - [ ] export dot content, load dot content
+- [ ] abstract voyager-core
+    - [ ] support fastapi-voyager
+    - [ ] support django-ninja-voyager
 
 
 ## in analysis

{fastapi_voyager-0.13.3 → fastapi_voyager-0.14.1}/pyproject.toml

@@ -9,7 +9,7 @@ requires-python = ">=3.10"
 keywords = ["fastapi", "visualization", "routing", "openapi"]
 dependencies = [
   "fastapi>=0.110",
-  "pydantic-resolve>=2.2.3"
+  "pydantic-resolve>=2.3.1"
 ]
 classifiers = [
   "Programming Language :: Python :: 3",

fastapi_voyager-0.14.1/src/fastapi_voyager/pydantic_resolve_util.py

@@ -0,0 +1,99 @@
+import inspect
+from pydantic import BaseModel
+from pydantic.fields import FieldInfo
+from pydantic_resolve.utils.er_diagram import LoaderInfo
+import pydantic_resolve.constant as const
+from pydantic_resolve.utils.expose import ExposeInfo
+from pydantic_resolve.utils.collector import SendToInfo, ICollector
+
+def analysis_pydantic_resolve_fields(schema: type[BaseModel], field: str):
+    """
+    get information for pydantic resolve specific info
+    in future, this function will be provide by pydantic-resolve package
+
+    is_resolve: bool = False
+    - check existence of def resolve_{field} method
+    - check existence of LoaderInfo in field.metadata
+
+    is_post: bool = False
+    - check existence of def post_{field} method
+
+    expose_as_info: str | None = None
+    - check ExposeInfo in field.metadata
+    - check field in schema.__pydantic_resolve_expose__ (const.EXPOSE_TO_DESCENDANT)
+
+    send_to_info: list[str] | None = None
+    - check SendToInfo in field.metadata
+    - check field in schema.__pydantic_resolve_collect__ (const.COLLECTOR_CONFIGURATION)
+
+    collect_info: list[str] | None = None
+    - 1. check existence of def post_{field} method
+    - 2. get the signature of this method
+    - 3. extrace the collector names from the parameters with ICollector metadata
+    
+
+
+    return dict in form of 
+    {
+        "is_resolve": True,
+        ...
+    }
+    """
+    has_meta = False
+    field_info: FieldInfo = schema.model_fields.get(field)
+    
+    is_resolve = hasattr(schema, f'{const.RESOLVE_PREFIX}{field}')
+    is_post = hasattr(schema, f'{const.POST_PREFIX}{field}')
+    expose_as_info = None
+    send_to_info = None
+    post_collector = []
+
+    send_to_info_list = []
+
+    if field_info:
+        # Check metadata
+        for meta in field_info.metadata:
+            if isinstance(meta, LoaderInfo):
+                is_resolve = True
+            if isinstance(meta, ExposeInfo):
+                expose_as_info = meta.alias
+            if isinstance(meta, SendToInfo):
+                if isinstance(meta.collector_name, str):
+                    send_to_info_list.append(meta.collector_name)
+                else:
+                    send_to_info_list.extend(list(meta.collector_name))
+
+    # Check class attributes
+    expose_dict = getattr(schema, const.EXPOSE_TO_DESCENDANT, {})
+    if field in expose_dict:
+        expose_as_info = expose_dict[field]
+
+    collect_dict = getattr(schema, const.COLLECTOR_CONFIGURATION, {})
+
+    for keys, collectors in collect_dict.items():
+        target_keys = [keys] if isinstance(keys, str) else list(keys)
+        if field in target_keys:
+            if isinstance(collectors, str):
+                send_to_info_list.append(collectors)
+            else:
+                send_to_info_list.extend(list(collectors))
+    
+    if send_to_info_list:
+        send_to_info = list(set(send_to_info_list))  # unique collectors
+    
+    if is_post:
+        post_method = getattr(schema, f'{const.POST_PREFIX}{field}')
+        for _, param in inspect.signature(post_method).parameters.items():
+            if isinstance(param.default, ICollector):
+                post_collector.append(param.default.alias)
+    
+    has_meta = any([is_resolve, is_post, expose_as_info, send_to_info])
+
+    return {
+        "has_pydantic_resolve_meta": has_meta,
+        "is_resolve": is_resolve,
+        "is_post": is_post,
+        "expose_as_info": expose_as_info,
+        "send_to_info": send_to_info,
+        "collect_info": None if len(post_collector) == 0 else post_collector
+    }

{fastapi_voyager-0.13.3 → fastapi_voyager-0.14.1}/src/fastapi_voyager/render.py

@@ -5,6 +5,7 @@ from fastapi_voyager.type import (
     PK,
     FieldType,
     Link,
+    FieldInfo,
     ModuleNode,
     ModuleRoute,
     Route,
@@ -22,24 +23,62 @@ class Renderer:
         show_fields: FieldType = 'single',
         module_color: dict[str, str] | None = None,
         schema: str | None = None,
-        show_module: bool = True
+        show_module: bool = True,
+        show_pydantic_resolve_meta: bool = False,
     ) -> None:
         self.show_fields = show_fields if show_fields in ('single', 'object', 'all') else 'single'
         self.module_color = module_color or {}
         self.schema = schema
         self.show_module = show_module
+        self.show_pydantic_resolve_meta = show_pydantic_resolve_meta
 
         logger.info(f'show_module: {self.show_module}')
         logger.info(f'module_color: {self.module_color}')
+    
+    def render_pydantic_related_markup(self, field: FieldInfo):
+        if self.show_pydantic_resolve_meta is False:
+            return ''
+
+        parts: list[str] = []
+        if field.is_resolve:
+            parts.append('<font color="#47a80f">  ● resolve</font>')
+        if field.is_post:
+            parts.append('<font color="#427fa4">  ● post</font>')
+        if field.expose_as_info:
+            parts.append(f'<font color="#895cb9">  ● expose as: {field.expose_as_info}</font>')
+        if field.send_to_info:
+            to_collectors = ', '.join(field.send_to_info)
+            parts.append(f'<font color="#ca6d6d">  ● send to: {to_collectors}</font>')
+        if field.collect_info:
+            defined_collectors = ', '.join(field.collect_info)
+            parts.append(f'<font color="#777">  ● collectors: {defined_collectors}</font>')
+
+        if not parts:
+            return ''
+        
+        return '<br align="left"/><br align="left"/>' + '<br align="left"/>'.join(parts) + '<br align="left"/>'
 
     def render_schema_label(self, node: SchemaNode, color: str | None=None) -> str:
+        """
+        TODO: should improve the logic with show_pydantic_resolve_meta
+        """
+
         has_base_fields = any(f.from_base for f in node.fields)
-        fields = [n for n in node.fields if n.from_base is False]
+
+        # if self.show_pydantic_resolve_meta, show all fields with resolve/post/expose/collector info
+        if self.show_pydantic_resolve_meta:
+            fields = [n for n in node.fields if n.has_pydantic_resolve_meta is True or n.from_base is False]
+        else:
+            fields = [n for n in node.fields if n.from_base is False]
 
         if self.show_fields == 'all':
             _fields = fields
         elif self.show_fields == 'object':
-            _fields = [f for f in fields if f.is_object is True]
+            if self.show_pydantic_resolve_meta:
+                # to better display resolve meta info
+                _fields = [f for f in fields if f.is_object is True or f.has_pydantic_resolve_meta is True]
+            else:
+                _fields = [f for f in fields if f.is_object is True]
         else:  # 'single'
             _fields = []
 
@@ -49,8 +88,8 @@ class Renderer:
 
         for field in _fields:
             type_name = field.type_name[:25] + '..' if len(field.type_name) > 25 else field.type_name
-            display_xml = f'<s align="left">{field.name}: {type_name}</s>' if field.is_exclude else f'{field.name}: {type_name}'
-            field_str = f"""<tr><td align="left" port="f{field.name}" cellpadding="8"><font>  {display_xml}    </font></td></tr>"""
+            display_xml = f'<s align="left">{field.name}: {type_name} </s>' if field.is_exclude else f'{field.name}: {type_name}'
+            field_str = f"""<tr><td align="left" port="f{field.name}" cellpadding="8"><font>  {display_xml}  </font> {self.render_pydantic_related_markup(field)}  </td></tr>"""
             fields_parts.append(field_str)
 
         default_color = '#009485' if color is None else color

{fastapi_voyager-0.13.3 → fastapi_voyager-0.14.1}/src/fastapi_voyager/server.py

@@ -47,6 +47,7 @@ class OptionParam(BaseModel):
 	initial_page_policy: INITIAL_PAGE_POLICY
 	swagger_url: str | None = None
 	has_er_diagram: bool = False
+	enable_pydantic_resolve_meta: bool = False
 
 class Payload(BaseModel):
 	tags: list[str] | None = None
@@ -57,6 +58,7 @@ class Payload(BaseModel):
 	brief: bool = False
 	hide_primitive_route: bool = False
 	show_module: bool = True
+	show_pydantic_resolve_meta: bool = False
 
 # ---------- search ----------
 class SearchResultOptionParam(BaseModel):
@@ -86,6 +88,7 @@ def create_voyager(
 	initial_page_policy: INITIAL_PAGE_POLICY = 'first',
 	ga_id: str | None = None,
 	er_diagram: ErDiagram | None = None,
+	enable_pydantic_resolve_meta: bool = False,
 ) -> FastAPI:
 	router = APIRouter(tags=['fastapi-voyager'])
 
@@ -121,7 +124,8 @@ def create_voyager(
 			version=__version__,
 			swagger_url=swagger_url,
 			initial_page_policy=initial_page_policy,
-			has_er_diagram=er_diagram is not None)
+			has_er_diagram=er_diagram is not None, 
+			enable_pydantic_resolve_meta=enable_pydantic_resolve_meta)
 
 
 	@router.post("/dot-search", response_model=SearchResultOptionParam)
@@ -133,6 +137,7 @@ def create_voyager(
 			module_color=module_color,
 			hide_primitive_route=payload.hide_primitive_route,
 			show_module=payload.show_module,
+			show_pydantic_resolve_meta=payload.show_pydantic_resolve_meta,
 		)
 		voyager.analysis(target_app)
 		tags = voyager.calculate_filtered_tag_and_route()
@@ -154,6 +159,7 @@ def create_voyager(
 			route_name=payload.route_name,
 			hide_primitive_route=payload.hide_primitive_route,
 			show_module=payload.show_module,
+			show_pydantic_resolve_meta=payload.show_pydantic_resolve_meta,
 		)
 		voyager.analysis(target_app)
 		if payload.brief:
@@ -179,7 +185,10 @@ def create_voyager(
 
 	@router.post('/dot-render-core-data', response_class=PlainTextResponse)
 	def render_dot_from_core_data(core_data: CoreData) -> str:
-		renderer = Renderer(show_fields=core_data.show_fields, module_color=core_data.module_color, schema=core_data.schema)
+		renderer = Renderer(
+			show_fields=core_data.show_fields,
+			module_color=core_data.module_color,
+			schema=core_data.schema)
 		return renderer.render_dot(core_data.tags, core_data.routes, core_data.nodes, core_data.links)
 
 	@router.get("/", response_class=HTMLResponse)

{fastapi_voyager-0.13.3 → fastapi_voyager-0.14.1}/src/fastapi_voyager/type.py

@@ -18,6 +18,14 @@ class FieldInfo:
     is_exclude: bool = False
     desc: str = ''
 
+    # pydantic resolve specific fields
+    has_pydantic_resolve_meta: bool = False  # overall flag
+    is_resolve: bool = False
+    is_post: bool = False
+    expose_as_info: str | None = None
+    send_to_info: list[str] | None = None
+    collect_info: list[str] | None = None
+
 @dataclass
 class Tag(NodeBase):
     routes: list['Route']  # route.id

{fastapi_voyager-0.13.3 → fastapi_voyager-0.14.1}/src/fastapi_voyager/type_helper.py

@@ -8,6 +8,7 @@ import pydantic_resolve.constant as const
 from pydantic import BaseModel
 
 from fastapi_voyager.type import FieldInfo
+from fastapi_voyager.pydantic_resolve_util import analysis_pydantic_resolve_fields
 
 logger = logging.getLogger(__name__)
 
@@ -177,13 +178,15 @@ def get_pydantic_fields(schema: type[BaseModel], bases_fields: set[str]) -> list
     fields: list[FieldInfo] = []
     for k, v in schema.model_fields.items():
         anno = v.annotation
+        pydantic_resolve_specific_params = analysis_pydantic_resolve_fields(schema, k)
         fields.append(FieldInfo(
             is_object=_is_object(anno),
             name=k,
             from_base=k in bases_fields,
             type_name=get_type_name(anno),
             is_exclude=bool(v.exclude),
-            desc=v.description or ''
+            desc=v.description or '',
+            **pydantic_resolve_specific_params
         ))
     return fields
 

{fastapi_voyager-0.13.3 → fastapi_voyager-0.14.1}/src/fastapi_voyager/version.py

@@ -1,2 +1,2 @@
 __all__ = ["__version__"]
-__version__ = "0.13.3"
+__version__ = "0.14.1"

{fastapi_voyager-0.13.3 → fastapi_voyager-0.14.1}/src/fastapi_voyager/voyager.py

@@ -33,6 +33,7 @@ class Voyager:
             route_name: str | None = None,
             hide_primitive_route: bool = False,
             show_module: bool = True,
+            show_pydantic_resolve_meta: bool = False,
         ):
 
         self.routes: list[Route] = []
@@ -55,6 +56,7 @@ class Voyager:
         self.route_name = route_name
         self.hide_primitive_route = hide_primitive_route
         self.show_module = show_module
+        self.show_pydantic_resolve_meta = show_pydantic_resolve_meta
     
 
     def _get_available_route(self, app: FastAPI):
@@ -319,7 +321,12 @@ class Voyager:
             node_set=self.node_set,
         )
 
-        renderer = Renderer(show_fields=self.show_fields, module_color=self.module_color, schema=self.schema, show_module=self.show_module)
+        renderer = Renderer(
+            show_fields=self.show_fields,
+            module_color=self.module_color, 
+            schema=self.schema, 
+            show_module=self.show_module,
+            show_pydantic_resolve_meta=self.show_pydantic_resolve_meta)
 
         _tags, _routes, _links = self.handle_hide(_tags, _routes, _links)
         return renderer.render_dot(_tags, _routes, _nodes, _links)

{fastapi_voyager-0.13.3 → fastapi_voyager-0.14.1}/src/fastapi_voyager/web/graph-ui.js

@@ -151,11 +151,6 @@ export class GraphUI {
           } else {
             self.currentSelection = [obj];
             self._highlight();
-            try {
-              self.options.resetCb();
-            } catch (e) {
-              console.warn("resetCb callback failed", e);
-            }
           }
         });
 

{fastapi_voyager-0.13.3 → fastapi_voyager-0.14.1}/src/fastapi_voyager/web/index.html

@@ -62,6 +62,15 @@
       border-top: 0; */
     }
 
+    .inherit-flow {
+      /* stroke-width:2; */
+      stroke-dasharray: 8 6;          /* dash pattern */
+      stroke-linecap: round;
+      animation: dash 2s linear infinite;
+      animation-direction: reverse;
+    }
+    @keyframes dash { to { stroke-dashoffset: -14; } }
+
     .adjust-fit {
       height: calc(100vh - 54px);
     }
@@ -140,6 +149,7 @@
             </div>
             <div class="col-auto row items-center q-gutter-sm">
               <q-select
+                v-show="!store.state.search.invisible"
                 dense
                 outlined
                 use-input
@@ -170,6 +180,7 @@
             </q-select>
               
               <q-select
+                v-show="!store.state.search.invisible"
                 dense
                 outlined
                 v-model="store.state.search.fieldName"
@@ -380,6 +391,15 @@
                       title="show module cluster"
                     />
                   </div>
+                  <div class="q-mt-sm" v-if="store.state.mode == 'voyager' && store.state.config.enable_pydantic_resolve_meta">
+                    <q-toggle
+                      v-model="store.state.modeControl.pydanticResolveMetaEnabled"
+                      @update:model-value="(val) => togglePydanticResolveMeta(val)"
+                      label="Pydantic Resolve Meta"
+                      dense
+                      title="show fields with pydantic resolve/post/expose/collector info"
+                    />
+                  </div>
               </div>
             </template>
           </q-splitter>

{fastapi_voyager-0.13.3 → fastapi_voyager-0.14.1}/src/fastapi_voyager/web/store.js

@@ -9,6 +9,7 @@ const state = reactive({
     config: {
         initial_page_policy: 'first',
         has_er_diagram: false,
+        enable_pydantic_resolve_meta: false,
     },
 
     mode: 'voyager', // voyager / er-diagram
@@ -55,6 +56,7 @@ const state = reactive({
     // schema options, schema, fields
     search: {  
         mode: false,  
+        invisible: false,
         schemaName: null,
         fieldName: null,
         schemaOptions: [],
@@ -90,6 +92,7 @@ const state = reactive({
     modeControl: {  
         focus: false,  // control the schema param
         briefModeEnabled: false,  // show brief mode toggle
+        pydanticResolveMetaEnabled: false,  // show pydantic resolve meta toggle
     },
 
     // api filters

{fastapi_voyager-0.13.3 → fastapi_voyager-0.14.1}/src/fastapi_voyager/web/vue-main.js

@@ -244,6 +244,7 @@ const app = createApp({
         store.state.version = data.version || "";
         store.state.swagger.url = data.swagger_url || null;
         store.state.config.has_er_diagram = data.has_er_diagram || false;
+        store.state.config.enable_pydantic_resolve_meta = data.enable_pydantic_resolve_meta || false;
 
         rebuildSchemaOptions();
 
@@ -314,6 +315,7 @@ const app = createApp({
           brief: store.state.filter.brief,
           hide_primitive_route: store.state.filter.hidePrimitiveRoute,
           show_module: store.state.filter.showModule,
+          show_pydantic_resolve_meta: store.state.modeControl.pydanticResolveMetaEnabled
         };
         initGraphUI();
         const res = await fetch("dot", {
@@ -345,6 +347,11 @@ const app = createApp({
         onGenerate()
     }
 
+    async function togglePydanticResolveMeta(val) {
+      store.state.modeControl.pydanticResolveMetaEnabled = val;
+      onGenerate();
+    }
+
     async function renderErDiagram(resetZoom = true) {
       initGraphUI();
       erDiagramLoading.value = true;
@@ -373,12 +380,19 @@ const app = createApp({
 
     async function onModeChange(val) {
       if (val === "er-diagram") {
+        // clear search 
+        store.state.search.schemaName = null
+        store.state.search.fieldName = null
+        store.state.search.invisible = true
+
         if (store.state.leftPanel.width > 0) {
           store.state.leftPanel.previousWidth = store.state.leftPanel.width;
         }
         store.state.leftPanel.width = 0;
         await renderErDiagram();
       } else {
+        store.state.search.invisible = false
+        
         const fallbackWidth = store.state.leftPanel.previousWidth || 300;
         store.state.leftPanel.width = fallbackWidth;
         await onGenerate();
@@ -525,6 +539,7 @@ const app = createApp({
       toggleShowModule,
       onModeChange,
       renderErDiagram,
+      togglePydanticResolveMeta
     };
   },
 });

{fastapi_voyager-0.13.3 → fastapi_voyager-0.14.1}/tests/demo.py

@@ -1,9 +1,9 @@
 from dataclasses import dataclass
-from typing import Generic, TypeVar
+from typing import Generic, TypeVar, Annotated
 
 from fastapi import FastAPI
 from pydantic import BaseModel, Field
-from pydantic_resolve import Resolver, ensure_subset
+from pydantic_resolve import Resolver, DefineSubset, ExposeAs, SendTo, Collector
 
 
 from tests.service.schema.schema import Member, Sprint, Story, Task
@@ -39,20 +39,36 @@ type TaskUnion = TaskA | TaskB
 class PageTask(Task):
     owner: PageMember | None
 
-@ensure_subset(Story)
-class PageStory(BaseModel):
-    id: int
-    sprint_id: int
-    title: str = Field(exclude=True)
+class MiddleStory(DefineSubset):
+    __subset__ = (Story, ('id', 'sprint_id', 'title'))
+
+class PageStory(DefineSubset):
+    __subset__ = (Story, ('id', 'sprint_id'))
+    # __subset__ = (Story, ('id', 'sprint_id', 'title:exclude')) # expected behavior, but not supported yet
+
+    title: Annotated[str, ExposeAs('story_title')] = Field(exclude=True)
+    def post_title(self):
+        return self.title + ' (processed)'
+
+    desc: Annotated[str, ExposeAs('story_desc')] = ''
+    def resolve_desc(self):
+        return self.desc
 
-    desc: str = ''
     def post_desc(self):
         return self.title + ' (processed ........................)'
+    
+    
 
-    tasks: list[PageTask] = []
+    tasks: Annotated[list[PageTask], SendTo("SomeCollector")] = []
     owner: PageMember | None = None
+    def resolve_owner(self):
+        return None
     union_tasks: list[TaskUnion] = []
 
+    coll: list[str] = []
+    def post_coll(self, c=Collector(alias="top_collector")):
+        return c.values()
+
 class PageSprint(Sprint):
     stories: list[PageStory]
     owner: PageMember | None = None

{fastapi_voyager-0.13.3 → fastapi_voyager-0.14.1}/tests/programatic.py

@@ -12,4 +12,5 @@ app.mount(
         swagger_url="/docs",
         initial_page_policy='first',
         ga_id='G-R64S7Q49VL',
-        online_repo_url="https://github.com/allmonday/fastapi-voyager/blob/main"))
+        online_repo_url="https://github.com/allmonday/fastapi-voyager/blob/main", 
+        enable_pydantic_resolve_meta=True))

fastapi_voyager-0.14.1/tests/test_resolve_util_impl.py

@@ -0,0 +1,68 @@
+from pydantic import BaseModel
+from typing import Annotated
+from pydantic_resolve import Collector
+from pydantic_resolve.utils.er_diagram import LoaderInfo
+from fastapi_voyager.pydantic_resolve_util import analysis_pydantic_resolve_fields
+
+
+class SchemaA(BaseModel):
+    __pydantic_resolve_expose__ = {"exposed_field": "alias_name"}
+    __pydantic_resolve_collect__ = {
+        "collected_field": "collector_name",
+        ("collected_field_a", "collected_field_b"): "collector_x",
+        ("collected_field_c", "collected_field_d"): ("collector_y", "collector_z"),
+
+        ("collected_field", "collected_field_c"): ("collector_u", "collector_v"),
+    }
+
+    id: int
+    resolved_field: Annotated[str, LoaderInfo(field="id")] = ""
+    exposed_field: str = ""
+    collected_field: str = ""
+
+    collected_field_a: str = ""
+    collected_field_b: str = ""
+
+    collected_field_c: str = ""
+    collected_field_d: str = ""
+
+    post_field: str = ""
+
+    def resolve_resolved_field(self):
+        return "resolved"
+
+    def post_post_field(self):
+        return "posted"
+
+    collector: list[str] = []
+    def post_collector(self, collector=Collector(alias="top_collector")):    
+        return collector.values()
+
+def test_resolve_util():
+    # Test resolved field
+    res = analysis_pydantic_resolve_fields(SchemaA, "resolved_field")
+    assert res["is_resolve"] is True
+
+    # Test exposed field
+    res = analysis_pydantic_resolve_fields(SchemaA, "exposed_field")
+    assert res["expose_as_info"] == "alias_name"
+
+    # Test collected field
+    res = analysis_pydantic_resolve_fields(SchemaA, "collected_field")
+    assert set(res["send_to_info"]) == {"collector_name", "collector_u", "collector_v"}
+
+    # Test collected field a (tuple key)
+    res = analysis_pydantic_resolve_fields(SchemaA, "collected_field_a")
+    assert set(res["send_to_info"]) == {"collector_x"}
+
+    # Test collected field c (tuple key and tuple value)
+    res = analysis_pydantic_resolve_fields(SchemaA, "collected_field_c")
+    assert set(res["send_to_info"]) == {"collector_y", "collector_z", "collector_u", "collector_v"}
+
+    # Test post field
+    res = analysis_pydantic_resolve_fields(SchemaA, "post_field")
+    assert res["is_post"] is True
+
+
+    res = analysis_pydantic_resolve_fields(SchemaA, "collector")
+    assert set(res["collect_info"]) == {"top_collector"}