catalystwan 0.41.2.dev6__py3-none-any.whl → 0.41.2.dev7__py3-none-any.whl

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/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/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/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/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.dist-info → catalystwan-0.41.2.dev7.dist-info}/METADATA

@@ -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.dist-info → catalystwan-0.41.2.dev7.dist-info}/RECORD

@@ -212,7 +212,7 @@ catalystwan/endpoints/tenant_management.py,sha256=c-kIRoS60aVklVPPrmbnW5kaiNgU23
 catalystwan/endpoints/tenant_migration.py,sha256=e6eIzRvlrnzUWqamKbWsYjX8drtB-GQKvhrJtX2VDKY,3649
 catalystwan/endpoints/troubleshooting_tools/device_connectivity.py,sha256=JkTZfebTwcambJsgjcJ8qxxBDE5XbUFyYpNqr9681DQ,3661
 catalystwan/endpoints/url_monitoring.py,sha256=ZySOjuCpIAZ4SIsah56yJ-uybYw0W9s6OjQp2FujN0g,802
-catalystwan/exceptions.py,sha256=MAtoZ9xrXmUgG-zMbdtChF7B2sHAgVlzv-euHOY1kKo,6620
+catalystwan/exceptions.py,sha256=fx4TCO1qCYvIilCIjS1PDk-vDW8_s-dS4PtjH1EQCOw,6641
 catalystwan/integration_tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 catalystwan/integration_tests/base.py,sha256=0BcKgDZcGjdPH2316C-1Se4FUeAtdrNXdkUVp_aXEZc,2367
 catalystwan/integration_tests/feature_profile/sdwan/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
@@ -231,7 +231,7 @@ catalystwan/integration_tests/feature_profile/sdwan/test_system.py,sha256=ab6fG7
 catalystwan/integration_tests/feature_profile/sdwan/test_tracker.py,sha256=GnIEHmUoIZObtBK-YvjYYtDsFnGSDpAVwi4rk9-r7XE,5117
 catalystwan/integration_tests/feature_profile/sdwan/test_transport.py,sha256=xRS880JCUD06xL_EaHKNylvaXB9wRHqUYsORhU2MYus,78923
 catalystwan/integration_tests/feature_profile/sdwan/topology/test_topology.py,sha256=2vsAd0pk3wcfo8wFTRttnw4gjSPJi1KFfFCu5lGAiJQ,4340
-catalystwan/integration_tests/feature_profile/test_parcel.py,sha256=4dqt5IP39lJ6vTsx3X7OdAHpYdbsIlDdpASFAM6d87Y,1517
+catalystwan/integration_tests/feature_profile/test_parcel.py,sha256=yIO0Ku2CfsCXxInSJJwRNTvfDw8MI3r1qdvna0yefxk,1499
 catalystwan/integration_tests/profile_builder/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 catalystwan/integration_tests/profile_builder/test_pb_service.py,sha256=WO6VVA7kNXesyGtk67e0lMDZBd4Z8wB7espBh0TzUTA,9420
 catalystwan/integration_tests/profile_builder/test_pb_transport.py,sha256=QQ5f1q6OV9dIyRQy1lb3Wp9beIKaWDaDLnNoGm4XY6A,10376
@@ -246,7 +246,7 @@ catalystwan/models/configuration/common.py,sha256=2X9gj5awWPKtLPFgWfxhkRrMoX22t1
 catalystwan/models/configuration/feature_profile/README.md,sha256=IQMhbnEAbLtotT80aL2emekH-ou8CqR0WSYXhZXilJw,10050
 catalystwan/models/configuration/feature_profile/builder.py,sha256=GDqK7ZxnWHTKWHRw13xvD1aDl60xe6gFsP_B9z5T8a8,663
 catalystwan/models/configuration/feature_profile/common.py,sha256=a5xohaoXzAewtqYYdk2GJy7B-rxxlxYatlP2WZ1eZqY,30423
-catalystwan/models/configuration/feature_profile/parcel.py,sha256=k3IyNVzjtDrTjUEBYvzQeQWeqNhRNk2tXDYqbQXWX2o,7583
+catalystwan/models/configuration/feature_profile/parcel.py,sha256=OD7rG4j55M_uAnA_rLGnX_Y0xddcxuEflAOL9-DPXPQ,7582
 catalystwan/models/configuration/feature_profile/sdwan/acl/__init__.py,sha256=-AXvVMLyaAYWUnwzTT_mvar37ZpO2vNRy_ZsUIA5dGo,324
 catalystwan/models/configuration/feature_profile/sdwan/acl/ipv4acl.py,sha256=HpiY0DCZWE9EHCbMbyIJ-iRharSRO3IGcSV3kWbMXjY,12167
 catalystwan/models/configuration/feature_profile/sdwan/acl/ipv6acl.py,sha256=MRtDNb2v1TNNf3yijLFlzL3H1KxHOquPmww1V9ZCacI,12969
@@ -396,7 +396,7 @@ catalystwan/models/feature_profile_parcel.py,sha256=ddjq8QzqsRv3yBKNDHUf-qgtyeOC
 catalystwan/models/misc/application_protocols.py,sha256=DZlBhLEu-HJ4w5cHCtfGWp34I95H4GRsToK1xcJCxK4,785
 catalystwan/models/monitoring/security_policy.py,sha256=WKGu_iHSHOM019dkBKWtyZWSIr9AQ56orQMMthexyB4,346
 catalystwan/models/monitoring/server_info.py,sha256=yToBDkBvuksaiZEaSefZTdh9P6sCVAmglpRYwJDkUWE,405
-catalystwan/models/policy/__init__.py,sha256=G3i0hYxWIJqifY_QNTGOjuNczHJ5FXiuh_MdS_r48Lw,14568
+catalystwan/models/policy/__init__.py,sha256=wtxlHq6TYkII682Him_1796xc6pnyCkn9olE76ls1Ss,14828
 catalystwan/models/policy/centralized.py,sha256=aKwUPxDFr8qzG0w0nVPqyhfDlpKb5dEdsvoeERybT7Y,9151
 catalystwan/models/policy/definition/access_control_list.py,sha256=blcrf2ixd7EJhGq9dPZidBpH3lD5w6BRsOY9AiUQNKA,6397
 catalystwan/models/policy/definition/access_control_list_ipv6.py,sha256=Hxd6CFXiCo3It5hTo9pqAdo191N10uaqbFJKRq_z1FI,6422
@@ -616,7 +616,7 @@ catalystwan/utils/device_model.py,sha256=IPEQD7yYyhCH91Uw9P-dF34TcIEimYEnImYVaaQ
 catalystwan/utils/dict.py,sha256=1IC4pcPFQ7yS39-ZWSFwyCvQKYzfZoxsz3YtJ-S6l7w,2110
 catalystwan/utils/feature_template/choose_model.py,sha256=JoQ7l_TF2PTH8bciOSVAFavevo35n2F4DbusIIvapM8,953
 catalystwan/utils/feature_template/find_template_values.py,sha256=nEi-hFmOaX5cHeS4VBSJmhxIl3jOn42o6mNSkS9Htak,5405
-catalystwan/utils/model.py,sha256=UCqpk2kpgT8YYRp4prv9kmR4ciBNvQDCl3ZB8Ln941k,1506
+catalystwan/utils/model.py,sha256=AbuERvgU_3w16rFaKOA1QM3F-xL7xW13YTB-hFWRIEo,1692
 catalystwan/utils/operation_status.py,sha256=SeT34c_x8F98mwl9x0-klvGTMKbrKSTY_w0zaKyuds8,584
 catalystwan/utils/persona.py,sha256=fZEMM2wgvvSuNaGwsLk-qWJUuZzkhYm1C3YUnRGOqRw,147
 catalystwan/utils/personality.py,sha256=vQ8dKNS6BPAVhRB6IyKRxX2y6a_ukAKBcYnTUuUFgoM,196
@@ -631,7 +631,7 @@ catalystwan/version.py,sha256=X5yIMPIrWPbdoF9eJfwxfjcvWr7JMfWQF98hQhlGB5I,3032
 catalystwan/vmanage_auth.py,sha256=UZ57lTihsLsXw4AdU7Vn8XuY1jo3732Vc9WuFoHSiiQ,10780
 catalystwan/workflows/backup_restore_device_templates.py,sha256=BoR2KlRbpCI6RxIWG7j7tucaLpw5w3ESN20dLhsrZFY,19796
 catalystwan/workflows/tenant_migration.py,sha256=4KLbqUwH4gEegE92PCGfRd226eZd_crCUpaYUWoGXDI,9790
-catalystwan-0.41.2.dev6.dist-info/LICENSE,sha256=97ROi91Vxrj_Jio2v8FI9E8-y6x2uYdQRaFlrEbVjkc,11375
-catalystwan-0.41.2.dev6.dist-info/METADATA,sha256=_U2izirHEsCyVz8rO2eGD5-YkcT7hmWw8DCCif5qRqQ,21275
-catalystwan-0.41.2.dev6.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
-catalystwan-0.41.2.dev6.dist-info/RECORD,,
+catalystwan-0.41.2.dev7.dist-info/LICENSE,sha256=97ROi91Vxrj_Jio2v8FI9E8-y6x2uYdQRaFlrEbVjkc,11375
+catalystwan-0.41.2.dev7.dist-info/METADATA,sha256=upW34fgE4q1jntiyM33WOUIhkzJJXzO-2yqf9g7w6A4,21275
+catalystwan-0.41.2.dev7.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+catalystwan-0.41.2.dev7.dist-info/RECORD,,