Add ModelView class for enhanced JSON serialization in NodeConfig
- Introduced a new `ModelView` class to facilitate JSON serialization of model data, supporting both single models and lists. - Updated `NodeConfig` methods to utilize `ModelView` for `vlans`, `interfaces`, and `system` properties, improving data handling consistency. - Refactored the `json` method to ensure proper serialization of parsed data.
This commit is contained in:
38
oxi/conf.py
38
oxi/conf.py
@@ -1,11 +1,35 @@
|
|||||||
from functools import cached_property
|
from functools import cached_property
|
||||||
from typing import TYPE_CHECKING
|
import json
|
||||||
|
from typing import TYPE_CHECKING, Generic, TypeVar
|
||||||
|
|
||||||
|
from pydantic import BaseModel
|
||||||
|
|
||||||
from .interfaces import BaseDevice, device_registry
|
from .interfaces import BaseDevice, device_registry
|
||||||
|
|
||||||
if TYPE_CHECKING:
|
if TYPE_CHECKING:
|
||||||
from requests import Session
|
from requests import Session
|
||||||
|
|
||||||
|
TModel = TypeVar("TModel", bound=BaseModel)
|
||||||
|
|
||||||
|
|
||||||
|
class ModelView(Generic[TModel]):
|
||||||
|
def __init__(self, model: TModel | list[TModel]):
|
||||||
|
self._model = model
|
||||||
|
|
||||||
|
def json(self) -> str:
|
||||||
|
if isinstance(self._model, list):
|
||||||
|
return json.dumps(
|
||||||
|
[item.model_dump(by_alias=True) for item in self._model],
|
||||||
|
ensure_ascii=False,
|
||||||
|
)
|
||||||
|
return self._model.model_dump_json(by_alias=True)
|
||||||
|
|
||||||
|
def __getattr__(self, item):
|
||||||
|
return getattr(self._model, item)
|
||||||
|
|
||||||
|
def __repr__(self) -> str:
|
||||||
|
return repr(self._model)
|
||||||
|
|
||||||
|
|
||||||
class NodeConfig:
|
class NodeConfig:
|
||||||
def __init__(self, session: "Session", full_name: str, model: str, base_url: str):
|
def __init__(self, session: "Session", full_name: str, model: str, base_url: str):
|
||||||
@@ -28,18 +52,20 @@ class NodeConfig:
|
|||||||
def text(self):
|
def text(self):
|
||||||
return self._response.text
|
return self._response.text
|
||||||
|
|
||||||
@property
|
|
||||||
def json(self):
|
def json(self):
|
||||||
return self._parsed_data.json()
|
return self._parsed_data.model_dump_json()
|
||||||
|
|
||||||
def __str__(self):
|
def __str__(self):
|
||||||
return self.text
|
return self.text
|
||||||
|
|
||||||
|
@property
|
||||||
def vlans(self):
|
def vlans(self):
|
||||||
return self._parsed_data.vlans
|
return ModelView(self._parsed_data.vlans)
|
||||||
|
|
||||||
|
@property
|
||||||
def interfaces(self):
|
def interfaces(self):
|
||||||
return self._parsed_data.interfaces
|
return ModelView(self._parsed_data.interfaces)
|
||||||
|
|
||||||
|
@property
|
||||||
def system(self):
|
def system(self):
|
||||||
return self._parsed_data.system
|
return ModelView(self._parsed_data.system)
|
||||||
|
|||||||
Reference in New Issue
Block a user