catalystwan 2.0.0a1__py3-none-any.whl → 2.0.0a2__py3-none-any.whl

catalystwan/core/__init__.py

@@ -1,2 +1,2 @@
 from catalystwan.core.client import create_client as create_client
-from catalystwan.core.client import create_thread_client as create_thread_client
+from catalystwan.core.client import create_client_from_auth as create_client_from_auth

catalystwan/core/client.py

@@ -3,28 +3,74 @@ from __future__ import annotations
 import logging
 from contextlib import contextmanager
 from copy import copy
-from typing import TYPE_CHECKING, Generator, Optional, Union
+from inspect import isclass
+from typing import TYPE_CHECKING, Generator, Optional, Type, TypeVar, Union, cast, overload
 
 from catalystwan.core.apigw_auth import ApiGwAuth
+from catalystwan.core.exceptions import CatalystwanException
 from catalystwan.core.loader import load_client
 from catalystwan.core.request_adapter import RequestAdapter
 from catalystwan.core.request_limiter import RequestLimiter
 from catalystwan.core.session import ManagerSession, create_base_url, create_manager_session
 from catalystwan.core.vmanage_auth import vManageAuth
+from typing_extensions import TypeGuard
 
 if TYPE_CHECKING:
     from catalystwan.core.loader import ApiClient
 
 
+class CatalystwanNotAClientException(CatalystwanException): ...
+
+
+Client = TypeVar("Client")
+
+
+# TODO: Better TypeGuards - it may be hard since we want to avoid direct imports
+# For now, it's more of a hack for typing purposes
+def _is_client_instance(obj: object) -> TypeGuard[ApiClient]:
+    return not isclass(obj) and hasattr(obj, "api_version")
+
+
+def _is_client_class(obj: object) -> TypeGuard[Type[ApiClient]]:
+    return isclass(obj) and hasattr(obj, "api_version")
+
+
+@overload
+@contextmanager
+def create_client_from_auth(
+    url: str,
+    auth: Union[vManageAuth, ApiGwAuth],
+    port: Optional[int] = None,
+    subdomain: Optional[str] = None,
+    logger: Optional[logging.Logger] = None,
+    request_limiter: Optional[RequestLimiter] = None,
+) -> Generator[ApiClient, None, None]: ...
+
+
+@overload
+@contextmanager
+def create_client_from_auth(
+    url: str,
+    auth: Union[vManageAuth, ApiGwAuth],
+    port: Optional[int] = None,
+    subdomain: Optional[str] = None,
+    logger: Optional[logging.Logger] = None,
+    request_limiter: Optional[RequestLimiter] = None,
+    *,
+    api_client_class: Type[Client],
+) -> Generator[Client, None, None]: ...
+
+
 @contextmanager
-def create_thread_client(
+def create_client_from_auth(
     url: str,
     auth: Union[vManageAuth, ApiGwAuth],
     port: Optional[int] = None,
     subdomain: Optional[str] = None,
     logger: Optional[logging.Logger] = None,
     request_limiter: Optional[RequestLimiter] = None,
-) -> Generator[ApiClient, None, None]:
+    api_client_class: Optional[Type[Client]] = None,
+) -> Generator[Union[ApiClient, Client], None, None]:
     if logger is None:
         logger = logging.getLogger(__name__)
     session = ManagerSession(
@@ -36,12 +82,31 @@ def create_thread_client(
     )
     with session.login():
         version = session.api_version.base_version
-        logger.debug(f"Choosing client for version {version}...")
-        client = load_client(session.api_version.base_version)
-        logger.debug(f"Client for version {version} loaded")
-        yield client(RequestAdapter(session=session, logger=logger))
+        if api_client_class is None:
+            logger.debug(f"Choosing client for version {version}...")
+            client = load_client(session.api_version.base_version)
+            logger.debug(f"Client for version {version} loaded")
+            yield client(RequestAdapter(session=session, logger=logger))
+        elif _is_client_class(api_client_class):
+            logger.debug(f"Creating instance for client class {api_client_class}")
+            yield api_client_class(RequestAdapter(session=session, logger=logger))
+        else:
+            raise CatalystwanNotAClientException(f"{api_client_class} is not a client class")
+
+
+@overload
+@contextmanager
+def create_client(
+    url: str,
+    username: str,
+    password: str,
+    port: Optional[int] = None,
+    subdomain: Optional[str] = None,
+    logger: Optional[logging.Logger] = None,
+) -> Generator[ApiClient, None, None]: ...
 
 
+@overload
 @contextmanager
 def create_client(
     url: str,
@@ -50,22 +115,45 @@ def create_client(
     port: Optional[int] = None,
     subdomain: Optional[str] = None,
     logger: Optional[logging.Logger] = None,
-) -> Generator[ApiClient, None, None]:
+    *,
+    api_client_class: Type[Client],
+) -> Generator[Client, None, None]: ...
+
+
+@contextmanager
+def create_client(
+    url: str,
+    username: str,
+    password: str,
+    port: Optional[int] = None,
+    subdomain: Optional[str] = None,
+    logger: Optional[logging.Logger] = None,
+    api_client_class: Optional[Type[Client]] = None,
+) -> Generator[Union[ApiClient, Client], None, None]:
     if logger is None:
         logger = logging.getLogger(__name__)
     with create_manager_session(url, username, password, port, subdomain, logger) as session:
-        version = session.api_version.base_version
-        logger.debug(f"Choosing client for version {version}...")
-        client = load_client(session.api_version.base_version)
-        logger.debug(f"Client for version {version} loaded")
-        yield client(RequestAdapter(session=session, logger=logger))
+        if api_client_class is None:
+            version = session.api_version.base_version
+            logger.debug(f"Choosing client for version {version}...")
+            client = load_client(session.api_version.base_version)
+            logger.debug(f"Client for version {version} loaded")
+            yield client(RequestAdapter(session=session, logger=logger))
+        elif _is_client_class(api_client_class):
+            logger.debug(f"Creating instance for client class {api_client_class}")
+            yield api_client_class(RequestAdapter(session=session, logger=logger))
+        else:
+            raise CatalystwanNotAClientException(f"{api_client_class} is not a client class")
 
 
 @contextmanager
-def copy_client(client: ApiClient) -> Generator[ApiClient, None, None]:
-    request_adapter = copy(client._request_adapter)
-    session = request_adapter.session
-    with session.login():
-        new_client = load_client(session.api_version.base_version)(request_adapter)
-        assert new_client.api_version == client.api_version
-        yield new_client
+def copy_client(client: Client) -> Generator[Client, None, None]:
+    if _is_client_instance(client):
+        request_adapter = copy(client._request_adapter)
+        session = request_adapter.session
+        with session.login():
+            new_client = load_client(session.api_version.base_version)(request_adapter)
+            assert new_client.api_version == client.api_version
+            yield cast(Client, new_client)
+    else:
+        raise CatalystwanNotAClientException(f"{client} is not a client instance")

catalystwan/core/models/deserialize.py

@@ -1,14 +1,15 @@
 from collections import deque
 from copy import deepcopy
-from dataclasses import fields, is_dataclass
+from dataclasses import dataclass, fields, is_dataclass
 from functools import reduce
 from inspect import isclass, unwrap
-from typing import Any, Dict, List, Literal, Protocol, Tuple, Type, TypeVar, Union
+from typing import Any, Dict, List, Literal, Optional, Protocol, Tuple, Type, TypeVar, Union, cast
 
 from catalystwan.core.exceptions import (
     CatalystwanModelInputException,
     CatalystwanModelValidationError,
 )
+from catalystwan.core.models.utils import count_matching_keys
 from catalystwan.core.types import MODEL_TYPES, AliasPath, DataclassInstance
 from typing_extensions import Annotated, get_args, get_origin, get_type_hints
 
@@ -19,6 +20,13 @@ class ValueExtractorCallable(Protocol):
     def __call__(self, field_value: Any) -> Any: ...
 
 
+@dataclass
+class ExtractedValue:
+    value: Any
+    exact_match: bool
+    matched_keys: Optional[int] = None
+
+
 class ModelDeserializer:
     def __init__(self, model: Type[T]) -> None:
         self.model = model
@@ -47,7 +55,6 @@ class ModelDeserializer:
 
     def __check_errors(self):
         if self._exceptions:
-            print(self._exceptions)
             # Put exceptions from current model first
             self._exceptions.sort(key=lambda x: isinstance(x, CatalystwanModelValidationError))
             current_model_errors = sum(
@@ -58,67 +65,91 @@ class ModelDeserializer:
                 message += f"{exc}\n"
             raise CatalystwanModelValidationError(message)
 
-    def __is_optional(self, t: Any) -> bool:
-        if get_origin(t) is Union and type(None) in get_args(t):
-            return True
-        return False
-
-    def __extract_type(self, field_type: Any, field_value: Any, field_name: str) -> Any:
+    def __extract_type(self, field_type: Any, field_value: Any, field_name: str) -> ExtractedValue:
         origin = get_origin(field_type)
         # check for simple types and classes
         if origin is None:
-            if field_type is Any:
-                return field_value
-            if isinstance(field_value, field_type):
-                return field_value
+            if field_type is Any or isinstance(field_value, field_type):
+                return ExtractedValue(value=field_value, exact_match=True)
+            # Do not cast bool values
+            elif field_type is bool:
+                ...
+            # False/Empty values (like empty string or list) can match to None
+            elif field_type is type(None):
+                if not field_value:
+                    return ExtractedValue(value=None, exact_match=False)
             elif is_dataclass(field_type):
-                assert isinstance(field_type, type)
-                return deserialize(field_type, **field_value)
+                model_instance = deserialize(
+                    cast(Type[DataclassInstance], field_type), **field_value
+                )
+                return ExtractedValue(
+                    value=model_instance,
+                    exact_match=False,
+                    matched_keys=count_matching_keys(model_instance, field_value),
+                )
             elif isclass(unwrap(field_type)):
                 if isinstance(field_value, dict):
-                    return field_type(**field_value)
+                    return ExtractedValue(value=field_type(**field_value), exact_match=False)
                 else:
                     try:
-                        return field_type(field_value)
+                        return ExtractedValue(value=field_type(field_value), exact_match=False)
                     except ValueError:
                         raise CatalystwanModelInputException(
                             f"Unable to match or cast input value for {field_name} [expected_type={unwrap(field_type)}, input={field_value}, input_type={type(field_value)}]"
                         )
+        # List is an exact match only if all of its elements are
         elif origin is list:
             if isinstance(field_value, list):
-                return [
-                    self.__extract_type(get_args(field_type)[0], value, field_name)
-                    for value in field_value
-                ]
-        elif self.__is_optional(field_type):
-            if field_value is None:
-                return None
-            else:
-                try:
-                    return self.__extract_type(get_args(field_type)[0], field_value, field_name)
-                except CatalystwanModelInputException as e:
-                    if not field_value:
-                        return None
-                    raise e
+                values = []
+                exact_match = True
+                for value in field_value:
+                    extracted_value = self.__extract_type(
+                        get_args(field_type)[0], value, field_name
+                    )
+                    values.append(extracted_value.value)
+                    if not extracted_value.exact_match:
+                        exact_match = False
+                return ExtractedValue(value=values, exact_match=exact_match)
         elif origin is Literal:
             for arg in get_args(field_type):
                 try:
                     if type(arg)(field_value) == arg:
-                        return type(arg)(field_value)
+                        return ExtractedValue(
+                            value=type(arg)(field_value), exact_match=type(arg) is type(field_value)
+                        )
                 except Exception:
                     continue
         elif origin is Annotated:
             validator, caster = field_type.__metadata__
             if validator(field_value):
-                return field_value
-            return caster(field_value)
-        # TODO: Currently, casting is done left-to-right. Searching deeper for a better match may be the way to go.
+                return ExtractedValue(value=field_value, exact_match=True)
+            return ExtractedValue(value=caster(field_value), exact_match=False)
+        # When parsing Unions, try to find the best match. Currently, it involves:
+        # 1. Finding the exact match
+        # 2. If not found, favors dataclasses - sorted by number of matched keys, then None values
+        # 3. If no dataclasses are present, return the leftmost matched argument
         elif origin is Union:
+            matches: List[ExtractedValue] = []
             for arg in get_args(field_type):
                 try:
-                    return self.__extract_type(arg, field_value, field_name)
+                    extracted_value = self.__extract_type(arg, field_value, field_name)
+                    # exact match, return
+                    if extracted_value.exact_match:
+                        return extracted_value
+                    else:
+                        matches.append(extracted_value)
                 except Exception:
                     continue
+            # Only one element matched, return
+            if len(matches) == 1:
+                return matches[0]
+            # Only non-exact matches left, sort and return first element
+            elif len(matches) > 1:
+                matches.sort(
+                    key=lambda x: (x.matched_keys is not None, x.matched_keys, x.value is None),
+                    reverse=True,
+                )
+                return matches[0]
         # Correct type not found, add exception
         raise CatalystwanModelInputException(
             f"Unable to match or cast input value for {field_name} [expected_type={unwrap(field_type)}, input={field_value}, input_type={type(field_value)}]"
@@ -131,7 +162,7 @@ class ModelDeserializer:
         kwargs_copy = deepcopy(kwargs)
         new_args = []
         new_kwargs = {}
-        field_types = get_type_hints(cls)
+        field_types = get_type_hints(cls, include_extras=True)
         for field in fields(cls):
             if not field.init:
                 continue
@@ -141,7 +172,9 @@ class ModelDeserializer:
                 field_value = args_copy.popleft()
                 try:
                     new_args.append(
-                        self.__extract_type(field_type, value_extractor(field_value), field.name)
+                        self.__extract_type(
+                            field_type, value_extractor(field_value), field.name
+                        ).value
                     )
                 except (
                     CatalystwanModelInputException,
@@ -165,7 +198,7 @@ class ModelDeserializer:
             try:
                 new_kwargs[field.name] = self.__extract_type(
                     field_type, value_extractor(field_value), field.name
-                )
+                ).value
             except (
                 CatalystwanModelInputException,
                 CatalystwanModelValidationError,

catalystwan/core/models/utils.py

@@ -0,0 +1,27 @@
+from dataclasses import is_dataclass
+from typing import TypeVar, cast
+
+from catalystwan.core.types import DataclassInstance
+
+DataclassType = TypeVar("DataclassType", bound=DataclassInstance)
+
+
+def count_matching_keys(model: DataclassType, model_payload: dict):
+    matched_keys = 0
+    for key, value in model_payload.items():
+        try:
+            model_value = getattr(model, key)
+            matched_keys += 1
+            if is_dataclass(model_value) and isinstance(value, dict):
+                matched_keys += count_matching_keys(cast(DataclassType, model_value), value)
+            elif (
+                isinstance(model_value, list)
+                and all([is_dataclass(element) for element in model_value])
+                and isinstance(value, list)
+            ):
+                for model_v, input_v in zip(model_value, value):
+                    matched_keys += count_matching_keys(model_v, input_v)
+        except AttributeError:
+            continue
+
+    return matched_keys

catalystwan/core/request_adapter.py

@@ -4,7 +4,7 @@ import logging
 from copy import copy
 from dataclasses import dataclass, field, fields, is_dataclass
 from string import Formatter
-from typing import Any, Dict, List, Optional, Type, TypeVar, Union, cast
+from typing import Any, Dict, List, Literal, Optional, Tuple, Type, TypeVar, Union, cast
 
 from catalystwan.abc import RequestAdapterInterface, ResponseInterface, SessionInterface
 from catalystwan.abc.types import HTTP_METHOD, JSON
@@ -14,6 +14,7 @@ from catalystwan.core.exceptions import (
 )
 from catalystwan.core.models.deserialize import deserialize
 from catalystwan.core.models.serialize import serialize
+from catalystwan.core.models.utils import count_matching_keys
 from catalystwan.core.types import DataclassInstance
 from typing_extensions import get_args, get_origin
 
@@ -213,34 +214,44 @@ class RequestAdapter(RequestAdapterInterface):
         # return model that matches best with the input
         valid_models.sort(
             key=lambda x: (
-                self.__count_matching_keys(x.model, cast(dict, x.payload.data)),
+                count_matching_keys(x.model, cast(dict, x.payload.data)),
                 x.payload.priority,
             ),
             reverse=True,
         )
         return valid_models[0].model
 
-    def __count_matching_keys(self, model: DataclassType, model_payload: dict):
-        matched_keys = 0
-        for key, value in model_payload.items():
-            try:
-                model_value = getattr(model, key)
-                matched_keys += 1
-                if is_dataclass(model_value) and isinstance(value, dict):
-                    matched_keys += self.__count_matching_keys(
-                        cast(DataclassType, model_value), value
-                    )
-                elif (
-                    isinstance(model_value, list)
-                    and all([is_dataclass(element) for element in model_value])
-                    and isinstance(value, list)
-                ):
-                    for model_v, input_v in zip(model_value, value):
-                        matched_keys += self.__count_matching_keys(model_v, input_v)
-            except AttributeError:
+    def param_checker(self, required_params: List[Tuple[Any, Any]], excluded_params: List[Any]):
+        for param in excluded_params:
+            if param is not None:
+                return False
+        for param_value, expected_type in required_params:
+            if param_value is None:
+                return False
+            origin = get_origin(expected_type)
+            if origin is Any:
                 continue
-
-        return matched_keys
+            elif origin is None:
+                if type(param_value) is not expected_type:
+                    return False
+            elif origin is Literal:
+                if param_value not in get_args(expected_type):
+                    return False
+            # This part assumes List and Unions are not overly complex, allowing get_args to flatten the list of types
+            elif origin is list:
+                if type(param_value) is not list:
+                    return False
+                args = get_args(expected_type)
+                if Any in args:
+                    continue
+                if type(param_value) not in args:
+                    return False
+            elif origin is Union:
+                if type(param_value) not in get_args(expected_type):
+                    return False
+            else:
+                continue
+        return True
 
     def __copy__(self) -> RequestAdapter:
         return RequestAdapter(session=copy(self.session), logger=self.logger)

catalystwan-2.0.0a2.dist-info/METADATA

@@ -0,0 +1,147 @@
+Metadata-Version: 2.4
+Name: catalystwan
+Version: 2.0.0a2
+Summary: Cisco Catalyst WAN SDK for Python
+License-Expression: Apache-2.0
+Project-URL: Homepage, https://github.com/cisco-en-programmability/catalystwan-sdk-next-python
+Classifier: Development Status :: 3 - Alpha
+Classifier: Intended Audience :: Developers
+Classifier: Programming Language :: Python
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.8
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Operating System :: OS Independent
+Classifier: Topic :: Internet
+Requires-Python: >=3.8
+Description-Content-Type: text/markdown
+License-File: LICENSE
+Requires-Dist: packaging>=23.0
+Requires-Dist: requests>=2.32.3
+Requires-Dist: typing-extensions>=4.12.2
+Requires-Dist: urllib3>=2.2.2
+Requires-Dist: catalystwan-types==2.0.0a0
+Requires-Dist: catalystwan-v20-15==2.0.0a1
+Requires-Dist: catalystwan-v20-16==2.0.0a1
+Provides-Extra: test
+Requires-Dist: pytest>=8.2.2; extra == "test"
+Provides-Extra: ver-all
+Requires-Dist: catalystwan-v20-15==2.0.0a1; extra == "ver-all"
+Requires-Dist: catalystwan-v20-16==2.0.0a1; extra == "ver-all"
+Provides-Extra: ver-2015
+Requires-Dist: catalystwan-v20-15==2.0.0a1; extra == "ver-2015"
+Provides-Extra: ver-2016
+Requires-Dist: catalystwan-v20-16==2.0.0a1; extra == "ver-2016"
+Dynamic: license-file
+
+Cisco Catalyst WAN SDK 2.0
+==========================
+
+Welcome to the official documentation for the Cisco Catalyst WAN SDK, a package designed for creating simple and parallel automatic requests via the official SD-WAN Manager API.
+
+Overview
+--------
+
+Cisco Catalyst WAN SDK serves as a multiple session handler (provider, provider as a tenant, tenant) and is environment-independent. You just need a connection to any SD-WAN Manager.
+
+Supported Catalystwan WAN Server Versions
+-----------------------------------------
+
+- 20.15
+- 20.16
+
+
+Important Notice: Version Incompatibility
+-----------------------------------------
+
+We are excited to announce the release of Cisco Catalyst WAN SDK version 2.0.
+This new version introduces a range of enhancements and features designed
+to improve performance and usability. However, it is important to note that version 2.0
+is not compatible with any previous legacy versions of the SDK.
+
+
+Actions Recommended:
+    Backup: Ensure you have backups of your current projects before attempting to upgrade.
+    Review Documentation: Carefully review the updated documentation and release notes for guidance on migration and new features.
+    Test Thoroughly: Test your projects thoroughly in a development environment before deploying version 2.0 in production.
+
+We appreciate your understanding and cooperation as we continue to enhance the Cisco Catalyst WAN SDK. Should you have any questions or require assistance, please reach out through our support channels.
+
+Thank you for your continued support and feedback!
+
+
+Not recommend to use in production environments.
+------------------------------------------------
+Cisco Catalyst WAN SDK in its `pre-alpha` release phase. This marks a significant milestone
+in empowering developers to unlock the full capabilities of Cisco's networking solutions.
+Please note that, as a pre-alpha release, this version of the SDK is still in active development
+and testing. It is provided "as is," with limited support offered on a best-effort basis.
+
+
+Supported Python Versions
+-------------------------
+
+Python >= 3.8
+
+> If you don't have a specific version, you can just use [Pyenv](https://github.com/pyenv/pyenv) to manage Python versions.
+
+
+Installation
+------------
+
+To install the SDK, run the following command:
+
+```bash
+pip install catalystwan==2.0.0a0
+```
+
+To manually install the necessary Python packages in editable mode, you can use the `pip install -e` command.
+
+```bash
+pip install -e ./packages/catalystwan-types \
+            -e ./packages/catalystwan-core \
+            -e ./versions/catalystwan-v20_15 \
+            -e ./versions/catalystwan-v20_16
+```
+
+
+Getting Started
+---------------
+
+To execute SDK APIs, you need to create a `ApiClient`. Use the `create_client()` method to configure a session, perform authentication, and obtain a `ApiClient` instance in an operational state.
+
+### Example Usage
+
+Here's a quick example of how to use the SDK:
+
+```python
+from catalystwan.core import create_client
+
+url = "example.com"
+username = "admin"
+password = "password123"
+
+with create_client(url=url, username=username, password=password) as client:
+    result = client.health.devices.get_devices_health()
+    print(result)
+```
+
+If you need to preform more complex operations that require models, they can utilize an alias: `m`.
+```python
+
+with create_client(...) as client:
+    result = client.admin.aaa.update_aaa_config(
+        client.admin.aaa.m.Aaa(
+            accounting: True,
+            admin_auth_order: False,
+            audit_disable: False,
+            auth_fallback: False,
+            auth_order: ["local"]
+        )
+    )
+    print(result)
+```
+
+Using an alias allows for easier access and management of models, simplifying workflows and improving efficiency. This approach helps streamline operations without requiring direct integration with underlying models, making them more user-friendly and scalable.

{catalystwan-2.0.0a1.dist-info → catalystwan-2.0.0a2.dist-info}/RECORD

@@ -1,13 +1,13 @@
-catalystwan/core/__init__.py,sha256=BtFD4803qN7cxzpl1hrUMMfV29mBEPH3DbCWcsJAhYM,148
+catalystwan/core/__init__.py,sha256=KRpud-erJoWEkgvlT6ZIEcrwx6lN96KSPyFLHEIfpAI,154
 catalystwan/core/abstractions.py,sha256=-Srp20skc9WDu6m2zGUjA34rEJPd12XQgDTGf_qicXk,738
 catalystwan/core/apigw_auth.py,sha256=-ZnoXzMB86SuRhJ5o7OL9BuVJTZvKQp9EW1zWu_4Iao,4706
-catalystwan/core/client.py,sha256=FPQEAqyLK-NQDOExEYEBzKQvghQ4Y7h2l6VY1IENSRI,2599
+catalystwan/core/client.py,sha256=skQ-ZrwFEn7w5MpS2lWew74cy5fJm3IeLD0MkWnR27c,5527
 catalystwan/core/encoder.py,sha256=hY_Osk9yyqvDgveB2pHmH5kzAzIO11vNT-kmSEmvgGA,243
 catalystwan/core/exceptions.py,sha256=Fhs69uEe-Uq4G4q3XS4N4oSQZJcjmlbL9jKtNkRWspQ,6680
 catalystwan/core/loader.py,sha256=AGjXJEt3qptG-B7iCKhXG0Y9p-wfG_-xD4H_6aSEiQ4,1133
 catalystwan/core/metadata.py,sha256=JIXC3um36dWLkEWCADo8pxsCsq8jjPguHF1u-4Ws2FQ,2102
 catalystwan/core/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-catalystwan/core/request_adapter.py,sha256=90bQcK6hiMpaqW3mxCM4HHsT9GTwcDHNz3Bu62oME6g,9783
+catalystwan/core/request_adapter.py,sha256=q1qOSJ5Cv9Tfiw2EED6WLMeT3cy2YPvRCQWm4HIDRmk,10218
 catalystwan/core/request_limiter.py,sha256=l0afY5HCpXCC_M6RoQSlg-X3k_bnTLieHGFfopuBDCk,521
 catalystwan/core/response.py,sha256=xj3MwOUt8lj4M3rElR5vnRThHlN1lU6xsNOCBsY1QXc,7824
 catalystwan/core/session.py,sha256=3uqHslMzq4CD_N0IEzygnEgbTGEi0NT1ljqA0CmuE8U,21504
@@ -15,10 +15,11 @@ catalystwan/core/types.py,sha256=X-u8OdRkCmJFA7NWZIgsrxvu83vFoDey5Z4Bqha0fdc,702
 catalystwan/core/version.py,sha256=cVKyfW_COPiF961Wlo3Gf5JL-2ZoFC1TfEfh49EUBEg,2959
 catalystwan/core/vmanage_auth.py,sha256=dJwxtA6XgOSghlrhW4G2kBbNaTHBPsTBSmg4-kuMLGc,11019
 catalystwan/core/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-catalystwan/core/models/deserialize.py,sha256=eYuLmn04j5kzvMs8MXlPmBf9B1uFaW-utksthbViKk4,8308
+catalystwan/core/models/deserialize.py,sha256=5_vq7Ay7eCbntG0Mf9_BnNTqo_uIqDxq64ahrhaqwLY,10135
 catalystwan/core/models/serialize.py,sha256=RW8zJ4NUMwIBtOaoLLuFTx5WS2rQdcfKiARjA3XX-W0,5110
-catalystwan-2.0.0a1.dist-info/LICENSE,sha256=97ROi91Vxrj_Jio2v8FI9E8-y6x2uYdQRaFlrEbVjkc,11375
-catalystwan-2.0.0a1.dist-info/METADATA,sha256=wAB7GAuqsLAsrv9kK8eC6yYZt20EavOUG8kHKZ0EjBU,14487
-catalystwan-2.0.0a1.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-catalystwan-2.0.0a1.dist-info/top_level.txt,sha256=0mv3rTOajNOAxvPHv_tHJpukVsP0plO5rD1ORKVDUM4,12
-catalystwan-2.0.0a1.dist-info/RECORD,,
+catalystwan/core/models/utils.py,sha256=9crw0Nrm05sJkKjcyDwPU5eM5QgTUUmYf-asxdkkYe0,995
+catalystwan-2.0.0a2.dist-info/licenses/LICENSE,sha256=97ROi91Vxrj_Jio2v8FI9E8-y6x2uYdQRaFlrEbVjkc,11375
+catalystwan-2.0.0a2.dist-info/METADATA,sha256=EcehBxcKF1U4sjjgNYGi8s3csD6JqiS0tYx5OWlNInc,5415
+catalystwan-2.0.0a2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+catalystwan-2.0.0a2.dist-info/top_level.txt,sha256=0mv3rTOajNOAxvPHv_tHJpukVsP0plO5rD1ORKVDUM4,12
+catalystwan-2.0.0a2.dist-info/RECORD,,

{catalystwan-2.0.0a1.dist-info → catalystwan-2.0.0a2.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.3.2)
+Generator: setuptools (80.9.0)
 Root-Is-Purelib: true
 Tag: py3-none-any
 

catalystwan-2.0.0a1.dist-info/METADATA

@@ -1,239 +0,0 @@
-Metadata-Version: 2.1
-Name: catalystwan
-Version: 2.0.0a1
-Summary: Cisco Catalyst WAN SDK for Python
-License: Apache License
-                                   Version 2.0, January 2004
-                                http://www.apache.org/licenses/
-        
-           TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-        
-           1. Definitions.
-        
-              "License" shall mean the terms and conditions for use, reproduction,
-              and distribution as defined by Sections 1 through 9 of this document.
-        
-              "Licensor" shall mean the copyright owner or entity authorized by
-              the copyright owner that is granting the License.
-        
-              "Legal Entity" shall mean the union of the acting entity and all
-              other entities that control, are controlled by, or are under common
-              control with that entity. For the purposes of this definition,
-              "control" means (i) the power, direct or indirect, to cause the
-              direction or management of such entity, whether by contract or
-              otherwise, or (ii) ownership of fifty percent (50%) or more of the
-              outstanding shares, or (iii) beneficial ownership of such entity.
-        
-              "You" (or "Your") shall mean an individual or Legal Entity
-              exercising permissions granted by this License.
-        
-              "Source" form shall mean the preferred form for making modifications,
-              including but not limited to software source code, documentation
-              source, and configuration files.
-        
-              "Object" form shall mean any form resulting from mechanical
-              transformation or translation of a Source form, including but
-              not limited to compiled object code, generated documentation,
-              and conversions to other media types.
-        
-              "Work" shall mean the work of authorship, whether in Source or
-              Object form, made available under the License, as indicated by a
-              copyright notice that is included in or attached to the work
-              (an example is provided in the Appendix below).
-        
-              "Derivative Works" shall mean any work, whether in Source or Object
-              form, that is based on (or derived from) the Work and for which the
-              editorial revisions, annotations, elaborations, or other modifications
-              represent, as a whole, an original work of authorship. For the purposes
-              of this License, Derivative Works shall not include works that remain
-              separable from, or merely link (or bind by name) to the interfaces of,
-              the Work and Derivative Works thereof.
-        
-              "Contribution" shall mean any work of authorship, including
-              the original version of the Work and any modifications or additions
-              to that Work or Derivative Works thereof, that is intentionally
-              submitted to Licensor for inclusion in the Work by the copyright owner
-              or by an individual or Legal Entity authorized to submit on behalf of
-              the copyright owner. For the purposes of this definition, "submitted"
-              means any form of electronic, verbal, or written communication sent
-              to the Licensor or its representatives, including but not limited to
-              communication on electronic mailing lists, source code control systems,
-              and issue tracking systems that are managed by, or on behalf of, the
-              Licensor for the purpose of discussing and improving the Work, but
-              excluding communication that is conspicuously marked or otherwise
-              designated in writing by the copyright owner as "Not a Contribution."
-        
-              "Contributor" shall mean Licensor and any individual or Legal Entity
-              on behalf of whom a Contribution has been received by Licensor and
-              subsequently incorporated within the Work.
-        
-           2. Grant of Copyright License. Subject to the terms and conditions of
-              this License, each Contributor hereby grants to You a perpetual,
-              worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-              copyright license to reproduce, prepare Derivative Works of,
-              publicly display, publicly perform, sublicense, and distribute the
-              Work and such Derivative Works in Source or Object form.
-        
-           3. Grant of Patent License. Subject to the terms and conditions of
-              this License, each Contributor hereby grants to You a perpetual,
-              worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-              (except as stated in this section) patent license to make, have made,
-              use, offer to sell, sell, import, and otherwise transfer the Work,
-              where such license applies only to those patent claims licensable
-              by such Contributor that are necessarily infringed by their
-              Contribution(s) alone or by combination of their Contribution(s)
-              with the Work to which such Contribution(s) was submitted. If You
-              institute patent litigation against any entity (including a
-              cross-claim or counterclaim in a lawsuit) alleging that the Work
-              or a Contribution incorporated within the Work constitutes direct
-              or contributory patent infringement, then any patent licenses
-              granted to You under this License for that Work shall terminate
-              as of the date such litigation is filed.
-        
-           4. Redistribution. You may reproduce and distribute copies of the
-              Work or Derivative Works thereof in any medium, with or without
-              modifications, and in Source or Object form, provided that You
-              meet the following conditions:
-        
-              (a) You must give any other recipients of the Work or
-                  Derivative Works a copy of this License; and
-        
-              (b) You must cause any modified files to carry prominent notices
-                  stating that You changed the files; and
-        
-              (c) You must retain, in the Source form of any Derivative Works
-                  that You distribute, all copyright, patent, trademark, and
-                  attribution notices from the Source form of the Work,
-                  excluding those notices that do not pertain to any part of
-                  the Derivative Works; and
-        
-              (d) If the Work includes a "NOTICE" text file as part of its
-                  distribution, then any Derivative Works that You distribute must
-                  include a readable copy of the attribution notices contained
-                  within such NOTICE file, excluding those notices that do not
-                  pertain to any part of the Derivative Works, in at least one
-                  of the following places: within a NOTICE text file distributed
-                  as part of the Derivative Works; within the Source form or
-                  documentation, if provided along with the Derivative Works; or,
-                  within a display generated by the Derivative Works, if and
-                  wherever such third-party notices normally appear. The contents
-                  of the NOTICE file are for informational purposes only and
-                  do not modify the License. You may add Your own attribution
-                  notices within Derivative Works that You distribute, alongside
-                  or as an addendum to the NOTICE text from the Work, provided
-                  that such additional attribution notices cannot be construed
-                  as modifying the License.
-        
-              You may add Your own copyright statement to Your modifications and
-              may provide additional or different license terms and conditions
-              for use, reproduction, or distribution of Your modifications, or
-              for any such Derivative Works as a whole, provided Your use,
-              reproduction, and distribution of the Work otherwise complies with
-              the conditions stated in this License.
-        
-           5. Submission of Contributions. Unless You explicitly state otherwise,
-              any Contribution intentionally submitted for inclusion in the Work
-              by You to the Licensor shall be under the terms and conditions of
-              this License, without any additional terms or conditions.
-              Notwithstanding the above, nothing herein shall supersede or modify
-              the terms of any separate license agreement you may have executed
-              with Licensor regarding such Contributions.
-        
-           6. Trademarks. This License does not grant permission to use the trade
-              names, trademarks, service marks, or product names of the Licensor,
-              except as required for reasonable and customary use in describing the
-              origin of the Work and reproducing the content of the NOTICE file.
-        
-           7. Disclaimer of Warranty. Unless required by applicable law or
-              agreed to in writing, Licensor provides the Work (and each
-              Contributor provides its Contributions) on an "AS IS" BASIS,
-              WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-              implied, including, without limitation, any warranties or conditions
-              of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-              PARTICULAR PURPOSE. You are solely responsible for determining the
-              appropriateness of using or redistributing the Work and assume any
-              risks associated with Your exercise of permissions under this License.
-        
-           8. Limitation of Liability. In no event and under no legal theory,
-              whether in tort (including negligence), contract, or otherwise,
-              unless required by applicable law (such as deliberate and grossly
-              negligent acts) or agreed to in writing, shall any Contributor be
-              liable to You for damages, including any direct, indirect, special,
-              incidental, or consequential damages of any character arising as a
-              result of this License or out of the use or inability to use the
-              Work (including but not limited to damages for loss of goodwill,
-              work stoppage, computer failure or malfunction, or any and all
-              other commercial damages or losses), even if such Contributor
-              has been advised of the possibility of such damages.
-        
-           9. Accepting Warranty or Additional Liability. While redistributing
-              the Work or Derivative Works thereof, You may choose to offer,
-              and charge a fee for, acceptance of support, warranty, indemnity,
-              or other liability obligations and/or rights consistent with this
-              License. However, in accepting such obligations, You may act only
-              on Your own behalf and on Your sole responsibility, not on behalf
-              of any other Contributor, and only if You agree to indemnify,
-              defend, and hold each Contributor harmless for any liability
-              incurred by, or claims asserted against, such Contributor by reason
-              of your accepting any such warranty or additional liability.
-        
-           END OF TERMS AND CONDITIONS
-        
-           APPENDIX: How to apply the Apache License to your work.
-        
-              To apply the Apache License to your work, attach the following
-              boilerplate notice, with the fields enclosed by brackets "[]"
-              replaced with your own identifying information. (Don't include
-              the brackets!)  The text should be enclosed in the appropriate
-              comment syntax for the file format. We also recommend that a
-              file or class name and description of purpose be included on the
-              same "printed page" as the copyright notice for easier
-              identification within third-party archives.
-        
-           Copyright (c) 2024 Cisco Systems, Inc. and/or its affiliates
-        
-           Licensed under the Apache License, Version 2.0 (the "License");
-           you may not use this file except in compliance with the License.
-           You may obtain a copy of the License at
-        
-               http://www.apache.org/licenses/LICENSE-2.0
-        
-           Unless required by applicable law or agreed to in writing, software
-           distributed under the License is distributed on an "AS IS" BASIS,
-           WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-           See the License for the specific language governing permissions and
-           limitations under the License.
-        
-Project-URL: Homepage, https://github.com/cisco-en-programmability/catalystwan-sdk-next-python
-Classifier: Development Status :: 3 - Alpha
-Classifier: Intended Audience :: Developers
-Classifier: License :: OSI Approved :: Apache Software License
-Classifier: Programming Language :: Python
-Classifier: Programming Language :: Python :: 3
-Classifier: Programming Language :: Python :: 3.8
-Classifier: Programming Language :: Python :: 3.9
-Classifier: Programming Language :: Python :: 3.10
-Classifier: Programming Language :: Python :: 3.11
-Classifier: Programming Language :: Python :: 3.12
-Classifier: Operating System :: OS Independent
-Classifier: Topic :: Internet
-Requires-Python: >=3.8
-Description-Content-Type: text/markdown
-License-File: LICENSE
-Requires-Dist: packaging >=23.0
-Requires-Dist: requests >=2.32.3
-Requires-Dist: typing-extensions >=4.12.2
-Requires-Dist: urllib3 >=2.2.2
-Requires-Dist: catalystwan-types ==2.0.0a0
-Requires-Dist: catalystwan-v20-15 ==2.0.0a1
-Requires-Dist: catalystwan-v20-16 ==2.0.0a1
-Provides-Extra: test
-Requires-Dist: pytest >=8.2.2 ; extra == 'test'
-Provides-Extra: ver-2015
-Requires-Dist: catalystwan-v20-15 ==2.0.0a1 ; extra == 'ver-2015'
-Provides-Extra: ver-2016
-Requires-Dist: catalystwan-v20-16 ==2.0.0a1 ; extra == 'ver-2016'
-Provides-Extra: ver-all
-Requires-Dist: catalystwan-v20-15 ==2.0.0a1 ; extra == 'ver-all'
-Requires-Dist: catalystwan-v20-16 ==2.0.0a1 ; extra == 'ver-all'
-