catalystwan 0.41.2.dev6__tar.gz → 0.41.2.dev7__tar.gz

{catalystwan-0.41.2.dev6 → catalystwan-0.41.2.dev7}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: catalystwan
-Version: 0.41.2.dev6
+Version: 0.41.2.dev7
 Summary: Cisco Catalyst WAN SDK for Python
 Author: kagorski
 Author-email: kagorski@cisco.com

{catalystwan-0.41.2.dev6 → catalystwan-0.41.2.dev7}/catalystwan/exceptions.py

@@ -218,8 +218,8 @@ class CatalystwanDeprecationWarning(DeprecationWarning):
         return message
 
 
-class ParcelModelNotFound(CatalystwanException):
-    """Raised when there is no model matching parcelType field"""
+class ModelNotFound(CatalystwanException):
+    """Raised when there is no model matching type specifier given as string"""
 
-    def __init__(self, type_):
-        self.message = f"Cannot determine model class for parcel type: {type_}"
+    def __init__(self, type_, scope):
+        self.message = f"Cannot find model class for {type_} when searching: {scope}"

{catalystwan-0.41.2.dev6 → catalystwan-0.41.2.dev7}/catalystwan/integration_tests/feature_profile/test_parcel.py

@@ -6,7 +6,7 @@ from pydantic import Field
 from typing_extensions import Annotated
 
 from catalystwan.api.configuration_groups.parcel import _ParcelBase
-from catalystwan.exceptions import ParcelModelNotFound
+from catalystwan.exceptions import ModelNotFound
 from catalystwan.models.configuration.feature_profile.parcel import find_type, list_types
 from catalystwan.models.configuration.feature_profile.sdwan.topology import (
     AnyTopologyParcel,
@@ -27,12 +27,12 @@ def test_find_type():
 
 
 def test_find_type_raises_when_no_match():
-    with pytest.raises(ParcelModelNotFound):
+    with pytest.raises(ModelNotFound):
         find_type("unknown", AnyTopologyParcel)
 
 
 def test_find_type_raises_for_bogus_param():
-    with pytest.raises(ParcelModelNotFound):
+    with pytest.raises(ModelNotFound):
         find_type("unknown", None)
 
 

{catalystwan-0.41.2.dev6 → catalystwan-0.41.2.dev7}/catalystwan/models/configuration/feature_profile/parcel.py

@@ -7,7 +7,7 @@ from pydantic import AliasChoices, BaseModel, ConfigDict, Field, model_validator
 from typing_extensions import Annotated
 
 from catalystwan.api.configuration_groups.parcel import _ParcelBase
-from catalystwan.exceptions import ParcelModelNotFound
+from catalystwan.exceptions import ModelNotFound
 from catalystwan.models.configuration.feature_profile.sdwan.application_priority import AnyApplicationPriorityParcel
 from catalystwan.models.configuration.feature_profile.sdwan.cli import AnyCliParcel
 from catalystwan.models.configuration.feature_profile.sdwan.dns_security import AnyDnsSecurityParcel
@@ -240,5 +240,5 @@ def find_type(name: str, any_union: Type[UT]) -> UT:
     try:
         parcel_type = next(t for t in parcel_types if t._get_parcel_type() == name)
     except StopIteration:
-        raise ParcelModelNotFound(name)
+        raise ModelNotFound(name, any_union)
     return cast(UT, parcel_type)

{catalystwan-0.41.2.dev6 → catalystwan-0.41.2.dev7}/catalystwan/models/policy/__init__.py

@@ -7,6 +7,7 @@ from typing import List, Sequence, Type, Union, cast
 from pydantic import Field
 from typing_extensions import Annotated
 
+from catalystwan.exceptions import ModelNotFound
 from catalystwan.models.policy.definition.app_route import AppRoutePolicy, AppRoutePolicyGetResponse
 from catalystwan.models.policy.definition.dial_peer import DialPeerPolicy, DialPeerPolicyGetResponse
 from catalystwan.models.policy.definition.fxo_port import FxoPortPolicy, FxoPortPolicyGetResponse
@@ -66,7 +67,7 @@ from catalystwan.models.policy.list.umbrella_data import UmbrellaDataList, Umbre
 from catalystwan.models.policy.list.url import URLAllowList, URLAllowListInfo, URLBlockList, URLBlockListInfo
 from catalystwan.models.policy.list.vpn import VPNList, VPNListInfo
 from catalystwan.models.policy.list.zone import ZoneList, ZoneListInfo
-from catalystwan.utils.model import get_model_type_field, resolve_nested_base_model_unions
+from catalystwan.utils.model import get_model_type_literals, resolve_nested_base_model_unions
 
 from .centralized import CentralizedPolicy, CentralizedPolicyInfo, TrafficDataDirection
 from .definition.access_control_list import AclPolicy, AclPolicyGetResponse
@@ -293,7 +294,10 @@ def find_policy_list_model(model_type: str) -> Type[AnyPolicyListInfo]:
         Sequence[Type[AnyPolicyListInfo]],
         resolve_nested_base_model_unions(AnyPolicyListInfo),
     )
-    model = next(t for t in types if get_model_type_field(t) == model_type)
+    try:
+        model = next(t for t in types if model_type in get_model_type_literals(t))
+    except StopIteration:
+        raise ModelNotFound(model_type, AnyPolicyListInfo)
     return model
 
 
@@ -303,7 +307,10 @@ def find_policy_definition_model(model_type: str) -> Type[AnyPolicyDefinitionInf
         Sequence[Type[AnyPolicyDefinitionInfo]],
         resolve_nested_base_model_unions(AnyPolicyDefinitionInfo),
     )
-    model = next(t for t in types if get_model_type_field(t) == model_type)
+    try:
+        model = next(t for t in types if model_type in get_model_type_literals(t))
+    except StopIteration:
+        raise ModelNotFound(model_type, AnyPolicyDefinitionInfo)
     return model
 
 

{catalystwan-0.41.2.dev6 → catalystwan-0.41.2.dev7}/catalystwan/utils/model.py

@@ -1,7 +1,7 @@
 # Copyright 2024 Cisco Systems, Inc. and its affiliates
 from functools import lru_cache
 from inspect import isclass
-from typing import Any, List, Optional, Type, Union
+from typing import Any, Iterable, List, Literal, Type, Union
 
 from pydantic import BaseModel
 from typing_extensions import Annotated, get_args, get_origin
@@ -38,8 +38,11 @@ def resolve_nested_base_model_unions(
 
 
 @lru_cache
-def get_model_type_field(model: Type[BaseModel]) -> Optional[str]:
-    if type_field := model.model_fields.get("type"):
-        if default_value := type_field.default:
-            return str(default_value)
-    return None
+def get_model_type_literals(model: Type[BaseModel], field: str = "type") -> Iterable[str]:
+    if type_field := model.model_fields.get(field):
+        origin = get_origin(type_field.annotation)
+        if origin is Literal:
+            literal_args = get_args(type_field.annotation)
+            if all(isinstance(arg, str) for arg in literal_args):
+                return literal_args
+    return ()

{catalystwan-0.41.2.dev6 → catalystwan-0.41.2.dev7}/pyproject.toml

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