dev: fix root model response parsing with no validate (#121)

* fix: root model response parsing with no validate

* add missing items in policy model stub

* regenerate endpoints doc

Author: sbasan

ENDPOINTS.md

@@ -1,6 +1,6 @@
 **THIS FILE WAS AUTO-GENERATED DO NOT EDIT**
 
-Generated for: catalystwan-0.41.1.dev3
+Generated for: catalystwan-0.41.1.dev4
 
 All URIs are relative to */dataservice*
 HTTP request | Supported Versions | Method | Payload Type | Return Type | Tenancy Mode

catalystwan/endpoints/__init__.py

@@ -76,8 +76,7 @@
 
 @runtime_checkable
 class CustomPayloadType(Protocol):
-    def prepared(self) -> PreparedPayload:
-        ...
+    def prepared(self) -> PreparedPayload: ...
 
 
 JSON = Union[str, int, float, bool, None, Dict[str, "JSON"], List["JSON"]]
@@ -263,9 +262,9 @@ class versions(APIEndpointsDecorator):
     Logs warning or raises exception when incompatibility found during runtime.
     """
 
-    versions_lookup: ClassVar[
-        Dict[str, SpecifierSet]
-    ] = {}  # maps decorated method instance to it's supported verisions
+    versions_lookup: ClassVar[Dict[str, SpecifierSet]] = (
+        {}
+    )  # maps decorated method instance to it's supported verisions
 
     def __init__(self, supported_versions: str, raises: bool = False):
         self.supported_versions = SpecifierSet(supported_versions)
@@ -355,9 +354,9 @@ class request(APIEndpointsDecorator):
     """
 
     forbidden_url_field_names = {"self", "payload", "params"}
-    request_lookup: ClassVar[
-        Dict[str, APIEndpointRequestMeta]
-    ] = {}  # maps decorated method instance to it's meta information
+    request_lookup: ClassVar[Dict[str, APIEndpointRequestMeta]] = (
+        {}
+    )  # maps decorated method instance to it's meta information
 
     def __init__(self, http_method: str, url: str, resp_json_key: Optional[str] = None, **kwargs):
         self.http_method = http_method

catalystwan/models/policy/__init__.py

@@ -103,15 +103,19 @@
     MultiRegionRole,
     OriginProtocol,
     PLPEntryType,
+    PolicyDefinitionInfo,
     ServiceType,
     TLOCActionType,
 )
+from .policy_list import PolicyListInfo
 from .security import (
     AnySecurityPolicy,
     AnySecurityPolicyInfo,
     AnySecurityPolicyInfoList,
     SecurityPolicy,
+    SecurityPolicyInfo,
     UnifiedSecurityPolicy,
+    UnifiedSecurityPolicyInfo,
 )
 
 AnyPolicyDefinition = Annotated[
@@ -351,6 +355,8 @@ def find_policy_definition_model(model_type: str) -> Type[AnyPolicyDefinitionInf
     "OriginProtocol",
     "PLPEntryType",
     "PolicerList",
+    "PolicyDefinitionInfo",
+    "PolicyListInfo",
     "PortList",
     "PreferredColorGroupList",
     "PrefixList",
@@ -364,6 +370,7 @@ def find_policy_definition_model(model_type: str) -> Type[AnyPolicyDefinitionInf
     "ScalableGroupTagList",
     "SecurityGroup",
     "SecurityPolicy",
+    "SecurityPolicyInfo",
     "ServiceType",
     "SiteList",
     "SLAClassList",
@@ -377,6 +384,7 @@ def find_policy_definition_model(model_type: str) -> Type[AnyPolicyDefinitionInf
     "TrunkGroupList",
     "UmbrellaDataList",
     "UnifiedSecurityPolicy",
+    "UnifiedSecurityPolicyInfo",
     "URLAllowList",
     "URLBlockList",
     "UrlFilteringPolicy",

catalystwan/response.py

@@ -9,7 +9,7 @@
 from typing import Any, Callable, Dict, Optional, Sequence, Type, TypeVar, Union, cast
 from urllib.parse import urlparse
 
-from pydantic import BaseModel
+from pydantic import BaseModel, RootModel
 from requests import PreparedRequest, Request, Response
 from requests.cookies import RequestsCookieJar
 from requests.exceptions import JSONDecodeError
@@ -236,7 +236,11 @@ def dataobj(self, cls: Type[T], sourcekey: Optional[str] = "data", validate: boo
         if issubclass(cls, BaseModel):
             if validate:
                 return cls.model_validate(data)  # type: ignore[return-value]
-            return cls.model_construct(**data)  # type: ignore[return-value]
+            else:
+                if issubclass(cls, RootModel):
+                    return cls.model_construct(data)  # type: ignore[return-value]
+                else:
+                    return cls.model_construct(**data)  # type: ignore[return-value]
         return create_dataclass(cls, data)
 
     def get_error_info(self) -> ManagerErrorInfo:

pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "catalystwan"
-version = "0.41.1.dev3"
+version = "0.41.1.dev4"
 description = "Cisco Catalyst WAN SDK for Python"
 authors = ["kagorski <kagorski@cisco.com>"]
 readme = "README.md"