fix media profile model (#70)

Author: sbasan

ENDPOINTS.md

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

catalystwan/models/common.py

@@ -377,17 +377,7 @@ def str_as_interface_list(val: Union[str, Sequence[InterfaceStr]]) -> Sequence[I
     "private6",
 ]
 
-MpVoiceCodec = Literal[
-    "G711aLaw",
-    "G711uLaw",
-    "G722",
-    "G729r8",
-    "ilbc",
-    "g711ulaw",
-    "g711alaw",
-    "g772",
-    "g729r8",
-]
+MpVoiceCodec = Literal["g711ulaw", "g711alaw", "g729r8", "g729br8", "g722-64", "clear-channel", "isac", "ilbc"]
 
 FaxProtocols = Literal[
     "Fax Pass-through G711alaw No ECM",
@@ -433,20 +423,22 @@ def str_as_interface_list(val: Union[str, Sequence[InterfaceStr]]) -> Sequence[I
 MpDtmf = Literal[
     "inband",
     "rtp-nte",
-    "rtp-nte sip-kpml",
-    "rtp-nte sip-kpml sip-notify",
-    "rtp-nte sip-notify",
-    "rtp-nte sip-notify sip-kpml",
-    "sip-kpml",
-    "sip-kpml rtp-nte",
-    "sip-kpml rtp-nte sip-notify",
-    "sip-kpml sip-notify",
-    "sip-kpml sip-notify rtp-nte",
     "sip-notify",
-    "sip-notify rtp-nte",
-    "sip-notify rtp-nte sip-kpml",
-    "sip-notify sip-kpml",
-    "sip-notify sip-kpml rtp-nte",
+    "sip-kpml",
+]
+
+
+def str_as_mp_dmtf_list(val: Union[str, Sequence[MpDtmf]]) -> Sequence[MpDtmf]:
+    if isinstance(val, str):
+        return [cast(MpDtmf, dtmf) for dtmf in val.split()]
+    return val
+
+
+SpaceSeparatedMpDtmfList = Annotated[
+    List[MpDtmf],
+    PlainSerializer(lambda x: " ".join(map(str, x)), return_type=MpDtmf, when_used="json-unless-none"),
+    BeforeValidator(str_as_mp_dmtf_list),
+    Field(min_length=1),
 ]
 
 HuntSchemeMethod = Literal[

catalystwan/models/configuration/feature_profile/sdwan/uc_voice/digital_interface.py

@@ -316,6 +316,8 @@ def validate_basic_settings_values(basic_settings: List[BasicSettings], check_fo
                     f"For {template_type} configuration, missing value for '{key}'. "
                     f"Expected one of: {check_for[key]}."
                 )
+            if attribute.option_type == "variable":
+                continue
             current_value = attribute.value
             if current_value not in values:
                 raise ValueError(

catalystwan/models/configuration/feature_profile/sdwan/uc_voice/media_profile.py

@@ -1,20 +1,12 @@
 # Copyright 2024 Cisco Systems, Inc. and its affiliates
-from typing import List, Literal, Optional, Union
+from typing import List, Literal, Union
 
-from pydantic import AliasPath, BaseModel, ConfigDict, Field
+from pydantic import AliasPath, ConfigDict, Field
 
 from catalystwan.api.configuration_groups.parcel import Default, Global, Variable, _ParcelBase
 from catalystwan.models.common import MpDtmf, MpVoiceCodec
 
 
-class Codec(BaseModel):
-    model_config = ConfigDict(populate_by_name=True)
-    value: Union[Variable, List[MpVoiceCodec]] = Field()
-    pref_num: Optional[str] = Field(
-        default=None, validation_alias="prefNum", serialization_alias="prefNum", description="Preference number"
-    )
-
-
 class MediaProfileParcel(_ParcelBase):
     model_config = ConfigDict(populate_by_name=True)
     type_: Literal["media-profile"] = Field(default="media-profile", exclude=True)

catalystwan/models/policy/list/media_profile.py

@@ -5,21 +5,21 @@
 from pydantic import BaseModel, ConfigDict, Field
 from typing_extensions import Annotated
 
-from catalystwan.models.common import IntStr, MpDtmf, MpVoiceCodec
+from catalystwan.models.common import IntStr, SpaceSeparatedMpDtmfList
 from catalystwan.models.policy.policy_list import PolicyListBase, PolicyListId, PolicyListInfo
 
 
 class CodecEntry(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
     type: Literal["codec"] = "codec"
     pref_num: IntStr = Field(ge=1, serialization_alias="prefNum", validation_alias="prefNum")
-    value: MpVoiceCodec
+    value: str
 
 
 class DtmfEntry(BaseModel):
     model_config = ConfigDict(populate_by_name=True)
     type: Literal["dtmf"] = "dtmf"
-    value: MpDtmf
+    value: SpaceSeparatedMpDtmfList
 
 
 AnyMediaProfileListEntry = Annotated[

pyproject.toml

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