dana-python 2.0.0__tar.gz → 2.1.0__tar.gz

{dana_python-2.0.0/dana_python.egg-info → dana_python-2.1.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dana-python
-Version: 2.0.0
+Version: 2.1.0
 Summary: API Client (SDK) for DANA APIs based on https://dashboard.dana.id/api-docs
 Author-email: DANA Package Manager  <package-manager@dana.id>
 Maintainer-email: DANA Package Manager  <package-manager@dana.id>

{dana_python-2.0.0 → dana_python-2.1.0}/dana/payment_gateway/v1/custom_validation.py

@@ -19,6 +19,7 @@ This module provides custom validation functions for Payment Gateway API request
 Validations are registered in the validation_registry and executed via custom_validation().
 """
 
+import os
 import re
 from typing import Any, Dict, List, Callable
 from dana.utils.date_validation import validate_valid_up_to_date
@@ -27,6 +28,36 @@ from dana.exceptions import ApiException
 # Money value pattern: digits (1-16) + "." + exactly 2 digits (e.g. 10000.00)
 MONEY_VALUE_PATTERN = re.compile(r'^\d{1,16}\.\d{2}$')
 
+# In sandbox, only these payMethods are available (Payment Gateway).
+SANDBOX_ALLOWED_PAY_METHODS = frozenset({
+    'BALANCE', 'CREDIT_CARD', 'DEBIT_CARD', 'VIRTUAL_ACCOUNT', 'NETWORK_PAY',
+})
+
+# In sandbox, only these payOptions are available (Payment Gateway).
+# API may send full identifiers (e.g. VIRTUAL_ACCOUNT_BRI); we accept exact match or suffix _OPTION.
+SANDBOX_ALLOWED_PAY_OPTIONS = frozenset({
+    'CARD', 'QRIS', 'BRI', 'PANIN', 'CIMB', 'MANDIRI', 'BTPN',
+})
+
+
+def _is_sandbox() -> bool:
+    """Return True if current environment is sandbox (DANA_ENV or ENV)."""
+    env = os.getenv('DANA_ENV', os.getenv('ENV', 'sandbox')).lower()
+    return env == 'sandbox'
+
+
+def _pay_option_allowed_in_sandbox(value: str) -> bool:
+    """Check if payOption value is allowed in sandbox (exact or suffix match, e.g. VIRTUAL_ACCOUNT_BRI)."""
+    if not value or not str(value).strip():
+        return False
+    s = str(value).strip()
+    if s in SANDBOX_ALLOWED_PAY_OPTIONS:
+        return True
+    for opt in SANDBOX_ALLOWED_PAY_OPTIONS:
+        if s.endswith('_' + opt):
+            return True
+    return False
+
 
 def validate_additional_info_required(request: Any) -> None:
     """
@@ -137,6 +168,50 @@ def validate_external_store_id_for_qris(request: Any) -> None:
             )
 
 
+def validate_sandbox_pay_method_and_pay_option(request: Any) -> None:
+    """
+    In sandbox, only certain payMethod and payOption values are available.
+
+    - payMethod: only BALANCE, CREDIT_CARD, DEBIT_CARD, VIRTUAL_ACCOUNT, NETWORK_PAY.
+    - payOption: only CARD, QRIS, BRI, PANIN, CIMB, MANDIRI, BTPN (exact or suffix, e.g. VIRTUAL_ACCOUNT_BRI).
+
+    Skipped when not in sandbox (DANA_ENV / ENV != sandbox).
+
+    Raises:
+        ApiException: If in sandbox and a payMethod or payOption is not allowed.
+    """
+    if request is None or not _is_sandbox():
+        return
+    if not hasattr(request, 'pay_option_details') or request.pay_option_details is None:
+        return
+    if not isinstance(request.pay_option_details, list):
+        return
+    for idx, detail in enumerate(request.pay_option_details):
+        if hasattr(detail, 'pay_method') and detail.pay_method is not None:
+            pm = getattr(detail.pay_method, 'value', detail.pay_method) if hasattr(detail.pay_method, 'value') else detail.pay_method
+            pm_str = str(pm).strip()
+            if pm_str and pm_str not in SANDBOX_ALLOWED_PAY_METHODS:
+                raise ApiException(
+                    status=0,
+                    reason=(
+                        f'In sandbox, payMethod must be one of {sorted(SANDBOX_ALLOWED_PAY_METHODS)}; '
+                        f'got {pm_str!r} in payOptionDetails[{idx}]'
+                    )
+                )
+        if hasattr(detail, 'pay_option') and detail.pay_option is not None:
+            po = getattr(detail.pay_option, 'value', detail.pay_option) if hasattr(detail.pay_option, 'value') else detail.pay_option
+            po_str = str(po).strip()
+            # Empty payOption is allowed (e.g. for BALANCE)
+            if po_str and not _pay_option_allowed_in_sandbox(po_str):
+                raise ApiException(
+                    status=0,
+                    reason=(
+                        f'In sandbox, payOption must be one of {sorted(SANDBOX_ALLOWED_PAY_OPTIONS)} '
+                        f'(or suffix like VIRTUAL_ACCOUNT_BRI); got {po!r} in payOptionDetails[{idx}]'
+                    )
+                )
+
+
 # Validation registry maps request class names to their validation functions
 validation_registry: Dict[str, List[Callable[[Any], None]]] = {
     'CreateOrderByApiRequest': [
@@ -144,17 +219,20 @@ validation_registry: Dict[str, List[Callable[[Any], None]]] = {
         validate_money_value_pattern,
         validate_valid_up_to_create_order_request,
         validate_external_store_id_for_qris,
+        validate_sandbox_pay_method_and_pay_option,
     ],
     'CreateOrderByRedirectRequest': [
         validate_additional_info_required,
         validate_money_value_pattern,
         validate_valid_up_to_create_order_request,
+        validate_sandbox_pay_method_and_pay_option,
     ],
     'CreateOrderRequest': [
         validate_additional_info_required,
         validate_money_value_pattern,
         validate_valid_up_to_create_order_request,
         validate_external_store_id_for_qris,
+        validate_sandbox_pay_method_and_pay_option,
     ],
     # Add more request types and their validations here as needed
 }

{dana_python-2.0.0 → dana_python-2.1.0}/dana/rest.py

@@ -190,7 +190,12 @@ class RESTClientObject:
                 ):
                     request_body = None
                     if body is not None:
-                        request_body = json.dumps(body)
+                        # If body is already a string or bytes (e.g. pre-serialized JSON from OpenAPI widget),
+                        # send as-is to avoid double JSON encoding. Otherwise serialize.
+                        if isinstance(body, (str, bytes)):
+                            request_body = body
+                        else:
+                            request_body = json.dumps(body)
                     r = self.pool_manager.request(
                         method,
                         url,

{dana_python-2.0.0 → dana_python-2.1.0}/dana/utils/open_api_header.py

@@ -90,12 +90,37 @@ class OpenApiHeader:
             elif private_key:
                 # Handle escaped newlines
                 private_key = private_key.replace("\\n", "\n")
-                private_key_obj = serialization.load_pem_private_key(
-                    private_key.encode(),
-                    password=None,
-                    backend=default_backend()
-                )
-                return private_key_obj
+                
+                # Check if private key already has PEM headers/footers
+                if not private_key.strip().startswith('-----BEGIN'):
+                    # Raw base64 key content - add PEM headers and footers
+                    private_key = f"-----BEGIN PRIVATE KEY-----\n{private_key}\n-----END PRIVATE KEY-----"
+                
+                try:
+                    private_key_obj = serialization.load_pem_private_key(
+                        private_key.encode(),
+                        password=None,
+                        backend=default_backend()
+                    )
+                    return private_key_obj
+                except ValueError as e:
+                    # If loading fails, try alternative PEM formats
+                    if "BEGIN PRIVATE KEY" in private_key:
+                        # Already in PKCS#8 format, try RSA format
+                        rsa_key = private_key.replace("-----BEGIN PRIVATE KEY-----", "-----BEGIN RSA PRIVATE KEY-----")
+                        rsa_key = rsa_key.replace("-----END PRIVATE KEY-----", "-----END RSA PRIVATE KEY-----")
+                        try:
+                            from cryptography.hazmat.primitives.serialization import load_pem_private_key
+                            private_key_obj = load_pem_private_key(
+                                rsa_key.encode(),
+                                password=None,
+                                backend=default_backend()
+                            )
+                            return private_key_obj
+                        except:
+                            pass
+                    
+                    raise ValueError(f"Unable to load private key: {str(e)}. Please ensure the private key is in proper PEM format.")
             else:
                 raise ValueError("Provide one of private_key or private_key_path")
 
@@ -155,14 +180,14 @@ class OpenApiHeader:
         # Generate unique request message ID
         req_msg_id = "sdk" + str(uuid.uuid4())[3:]
         
-        # Return auth settings following snap_header pattern
+        # Return auth settings following correct field order: version, function, clientId, clientSecret, reqTime, reqMsgId, reserve
         return {
             VERSION: generateOpenApiSetting(key=VERSION, value=version),
             FUNCTION: generateOpenApiSetting(key=FUNCTION, value=function_name),
             CLIENT_ID: generateOpenApiSetting(key=CLIENT_ID, value=client_id),
+            CLIENT_SECRET: generateOpenApiSetting(key=CLIENT_SECRET, value=client_secret),
             REQ_TIME: generateOpenApiSetting(key=REQ_TIME, value=timestamp),
             REQ_MSG_ID: generateOpenApiSetting(key=REQ_MSG_ID, value=req_msg_id),
-            CLIENT_SECRET: generateOpenApiSetting(key=CLIENT_SECRET, value=client_secret),
             RESERVE: generateOpenApiSetting(key=RESERVE, value="{}")
         }
 

{dana_python-2.0.0 → dana_python-2.1.0}/dana/widget/v1/api/widget_api.py

@@ -21,6 +21,7 @@
     Generated by OpenAPI Generator (https://openapi-generator.tech)
     Do not edit the class manually.
 """  # noqa: E501
+import json
 import warnings
 from pydantic import validate_call, Field, StrictFloat, StrictStr, StrictInt
 from typing import Any, Dict, List, Optional, Tuple, Union, Type
@@ -1901,6 +1902,70 @@ class WidgetApi:
         # authentication setting
         _auth_settings: List[str] = [
         ]
+        # For OPEN_API type, we use CLIENT_SECRET authentication with signature
+        # merge list of auth settings with Open API runtime headers
+        from dana.utils.open_api_header import OpenApiHeader
+        _auth_settings = OpenApiHeader.merge_with_open_api_runtime_headers(_auth_settings)
+        # Create the full request structure for OPEN_API
+        # Wrap the simplified body parameters in the proper DANA request format
+        # Extract accessToken from request body if available (widget-specific)
+        request_body_dict = query_user_profile_request.to_dict()
+        access_token = request_body_dict.get('accessToken', '')
+        # Create body without accessToken (for queryUserProfile)
+        body_without_access_token = {k: v for k, v in request_body_dict.items() if k != 'accessToken'}
+        # Generate head parameters
+        _generated_auth = OpenApiHeader.get_open_api_generated_headers(
+            method='POST',
+            resource_path='/dana/member/query/queryUserProfile.htm',
+            body='{}',  # Empty body for head generation
+            function_name="dana.member.query.queryUserProfile",
+            client_id=self.api_client.configuration.get_api_key_with_prefix('X_PARTNER_ID'),
+            client_secret=self.api_client.configuration.get_api_key_with_prefix('CLIENT_SECRET')
+        )
+        # Extract values from auth settings for JSON body, ensuring correct field order
+        head_params = {}
+        # Add fields in the correct order: version, function, clientId, clientSecret, reqTime, reqMsgId
+        for key in ['version', 'function', 'clientId', 'clientSecret', 'reqTime', 'reqMsgId']:
+            if key in _generated_auth:
+                head_params[key] = _generated_auth[key]['value']
+        # Add accessToken before reserve if found in request body (widget-specific)
+        if access_token:
+            head_params['accessToken'] = access_token
+        # Add reserve at the end
+        if 'reserve' in _generated_auth:
+            head_params['reserve'] = _generated_auth['reserve']['value']
+        # Create the full request structure (use body without accessToken)
+        request_body = {
+            "request": {
+                "head": head_params,
+                "body": body_without_access_token
+            }
+        }
+        # Generate signature (pass full structure, function will extract request part)
+        _signature = OpenApiHeader.generate_open_api_signature(
+                body=json.dumps(request_body),
+                private_key=self.api_client.configuration.get_api_key_with_prefix('PRIVATE_KEY')
+            )
+        # Add signature to the request
+        if _signature:
+            request_body['signature'] = _signature
+        # Convert final request to JSON string
+        _body_params = json.dumps(request_body)
+        return self.api_client.param_serialize(
+            method='POST',
+            resource_path='/dana/member/query/queryUserProfile.htm',
+            path_params=_path_params,
+            query_params=_query_params,
+            header_params=_header_params,
+            body=_body_params,
+            post_params=_form_params,
+            files=_files,
+            auth_settings=_auth_settings,
+            collection_formats=_collection_formats,
+            _host=_host,
+            _request_auth=_request_auth,
+            _generated_auth=_generated_auth,
+        )
     @validate_call
     def refund_order(
         self,

{dana_python-2.0.0 → dana_python-2.1.0}/dana/widget/v1/enum.py

@@ -41,11 +41,20 @@ class Mode(str, Enum):
 
 class ResourceType(str, Enum):
     BALANCE = "BALANCE"
-    TRANSACTION_URL = "TRANSACTION_URL"
-    MASK_DANA_ID = "MASK_DANA_ID"
     TOPUP_URL = "TOPUP_URL"
+    TRANSACTION_URL = "TRANSACTION_URL"
     OTT = "OTT"
+    MASK_DANA_ID = "MASK_DANA_ID"
     USER_KYC = "USER_KYC"
+    LOGIN_ID = "LOGIN_ID"
+    CLEAR_TEXT_DANA_ID = "CLEAR_TEXT_DANA_ID"
+    NICKNAME = "NICKNAME"
+    FULLNAME = "FULLNAME"
+    KTP_NUMBER = "KTP_NUMBER"
+    KTP_PHOTO_DATA = "KTP_PHOTO_DATA"
+    SELFIE_PHOTO_DATA = "SELFIE_PHOTO_DATA"
+    AVATAR_URL = "AVATAR_URL"
+    MASKED_FULLNAME = "MASKED_FULLNAME"
 
 class ResultStatus(str, Enum):
     S = "S"

{dana_python-2.0.0 → dana_python-2.1.0}/dana/widget/v1/models/account_info.py

@@ -38,7 +38,7 @@ from pydantic import BaseModel, ConfigDict, Field
 from typing import Any, ClassVar, Dict, List, Optional
 from typing_extensions import Annotated
 from dana.widget.v1.models.money import Money
-from typing import Optional, Set
+from typing import Optional, Set, Union
 from typing_extensions import Self
 from pydantic import AliasGenerator
 from pydantic.alias_generators import to_camel
@@ -119,13 +119,20 @@ class AccountInfo(BaseModel, BaseSdkModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+    def from_dict(cls, obj: Optional[Union[Dict[str, Any], str]]) -> Optional[Self]:
         """Create an instance of AccountInfo from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return cls.model_validate(obj)
+            # If it's a string (JSON), try to parse it
+            if isinstance(obj, str):
+                try:
+                    obj = json.loads(obj)
+                except json.JSONDecodeError:
+                    return cls.model_validate(obj)
+            else:
+                return cls.model_validate(obj)
 
         _obj = cls.model_validate({
             "balanceType": obj.get("balanceType"),

{dana_python-2.0.0 → dana_python-2.1.0}/dana/widget/v1/models/account_unbinding_request.py

@@ -38,7 +38,7 @@ from pydantic import BaseModel, ConfigDict, Field
 from typing import Any, ClassVar, Dict, List, Optional
 from typing_extensions import Annotated
 from dana.widget.v1.models.account_unbinding_request_additional_info import AccountUnbindingRequestAdditionalInfo
-from typing import Optional, Set
+from typing import Optional, Set, Union
 from typing_extensions import Self
 from pydantic import AliasGenerator
 from pydantic.alias_generators import to_camel
@@ -101,13 +101,20 @@ class AccountUnbindingRequest(BaseModel, BaseSdkModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+    def from_dict(cls, obj: Optional[Union[Dict[str, Any], str]]) -> Optional[Self]:
         """Create an instance of AccountUnbindingRequest from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return cls.model_validate(obj)
+            # If it's a string (JSON), try to parse it
+            if isinstance(obj, str):
+                try:
+                    obj = json.loads(obj)
+                except json.JSONDecodeError:
+                    return cls.model_validate(obj)
+            else:
+                return cls.model_validate(obj)
 
         _obj = cls.model_validate({
             "merchantId": obj.get("merchantId"),

{dana_python-2.0.0 → dana_python-2.1.0}/dana/widget/v1/models/account_unbinding_request_additional_info.py

@@ -37,7 +37,7 @@ from dana.base.model import BaseSdkModel
 from pydantic import BaseModel, ConfigDict, Field, field_validator
 from typing import Any, ClassVar, Dict, List, Optional
 from typing_extensions import Annotated
-from typing import Optional, Set
+from typing import Optional, Set, Union
 from typing_extensions import Self
 from pydantic import AliasGenerator
 from pydantic.alias_generators import to_camel
@@ -116,13 +116,20 @@ class AccountUnbindingRequestAdditionalInfo(BaseModel, BaseSdkModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+    def from_dict(cls, obj: Optional[Union[Dict[str, Any], str]]) -> Optional[Self]:
         """Create an instance of AccountUnbindingRequestAdditionalInfo from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return cls.model_validate(obj)
+            # If it's a string (JSON), try to parse it
+            if isinstance(obj, str):
+                try:
+                    obj = json.loads(obj)
+                except json.JSONDecodeError:
+                    return cls.model_validate(obj)
+            else:
+                return cls.model_validate(obj)
 
         _obj = cls.model_validate({
             "accessToken": obj.get("accessToken"),

{dana_python-2.0.0 → dana_python-2.1.0}/dana/widget/v1/models/account_unbinding_response.py

@@ -37,7 +37,7 @@ from dana.base.model import BaseSdkModel
 from pydantic import BaseModel, ConfigDict, Field
 from typing import Any, ClassVar, Dict, List, Optional
 from typing_extensions import Annotated
-from typing import Optional, Set
+from typing import Optional, Set, Union
 from typing_extensions import Self
 from pydantic import AliasGenerator
 from pydantic.alias_generators import to_camel
@@ -100,13 +100,20 @@ class AccountUnbindingResponse(BaseModel, BaseSdkModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+    def from_dict(cls, obj: Optional[Union[Dict[str, Any], str]]) -> Optional[Self]:
         """Create an instance of AccountUnbindingResponse from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return cls.model_validate(obj)
+            # If it's a string (JSON), try to parse it
+            if isinstance(obj, str):
+                try:
+                    obj = json.loads(obj)
+                except json.JSONDecodeError:
+                    return cls.model_validate(obj)
+            else:
+                return cls.model_validate(obj)
 
         _obj = cls.model_validate({
             "responseCode": obj.get("responseCode"),

{dana_python-2.0.0 → dana_python-2.1.0}/dana/widget/v1/models/amount_detail.py

@@ -37,7 +37,7 @@ from dana.base.model import BaseSdkModel
 from pydantic import BaseModel, ConfigDict, Field
 from typing import Any, ClassVar, Dict, List, Optional
 from dana.widget.v1.models.money import Money
-from typing import Optional, Set
+from typing import Optional, Set, Union
 from typing_extensions import Self
 from pydantic import AliasGenerator
 from pydantic.alias_generators import to_camel
@@ -119,13 +119,20 @@ class AmountDetail(BaseModel, BaseSdkModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+    def from_dict(cls, obj: Optional[Union[Dict[str, Any], str]]) -> Optional[Self]:
         """Create an instance of AmountDetail from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return cls.model_validate(obj)
+            # If it's a string (JSON), try to parse it
+            if isinstance(obj, str):
+                try:
+                    obj = json.loads(obj)
+                except json.JSONDecodeError:
+                    return cls.model_validate(obj)
+            else:
+                return cls.model_validate(obj)
 
         _obj = cls.model_validate({
             "orderAmount": Money.from_dict(obj["orderAmount"]) if obj.get("orderAmount") is not None else None,

{dana_python-2.0.0 → dana_python-2.1.0}/dana/widget/v1/models/apply_ott_request.py

@@ -38,7 +38,7 @@ from pydantic import BaseModel, ConfigDict, Field, field_validator
 from typing import Any, ClassVar, Dict, List
 from typing_extensions import Annotated
 from dana.widget.v1.models.apply_ott_request_additional_info import ApplyOTTRequestAdditionalInfo
-from typing import Optional, Set
+from typing import Optional, Set, Union
 from typing_extensions import Self
 from pydantic import AliasGenerator
 from pydantic.alias_generators import to_camel
@@ -105,13 +105,20 @@ class ApplyOTTRequest(BaseModel, BaseSdkModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+    def from_dict(cls, obj: Optional[Union[Dict[str, Any], str]]) -> Optional[Self]:
         """Create an instance of ApplyOTTRequest from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return cls.model_validate(obj)
+            # If it's a string (JSON), try to parse it
+            if isinstance(obj, str):
+                try:
+                    obj = json.loads(obj)
+                except json.JSONDecodeError:
+                    return cls.model_validate(obj)
+            else:
+                return cls.model_validate(obj)
 
         _obj = cls.model_validate({
             "userResources": obj.get("userResources"),

{dana_python-2.0.0 → dana_python-2.1.0}/dana/widget/v1/models/apply_ott_request_additional_info.py

@@ -37,7 +37,7 @@ from dana.base.model import BaseSdkModel
 from pydantic import BaseModel, ConfigDict, Field, field_validator
 from typing import Any, ClassVar, Dict, List, Optional
 from typing_extensions import Annotated
-from typing import Optional, Set
+from typing import Optional, Set, Union
 from typing_extensions import Self
 from pydantic import AliasGenerator
 from pydantic.alias_generators import to_camel
@@ -116,13 +116,20 @@ class ApplyOTTRequestAdditionalInfo(BaseModel, BaseSdkModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+    def from_dict(cls, obj: Optional[Union[Dict[str, Any], str]]) -> Optional[Self]:
         """Create an instance of ApplyOTTRequestAdditionalInfo from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return cls.model_validate(obj)
+            # If it's a string (JSON), try to parse it
+            if isinstance(obj, str):
+                try:
+                    obj = json.loads(obj)
+                except json.JSONDecodeError:
+                    return cls.model_validate(obj)
+            else:
+                return cls.model_validate(obj)
 
         _obj = cls.model_validate({
             "accessToken": obj.get("accessToken"),

{dana_python-2.0.0 → dana_python-2.1.0}/dana/widget/v1/models/apply_ott_response.py

@@ -38,7 +38,7 @@ from pydantic import BaseModel, ConfigDict, Field
 from typing import Any, ClassVar, Dict, List, Optional
 from typing_extensions import Annotated
 from dana.widget.v1.models.apply_ott_response_user_resources_inner import ApplyOTTResponseUserResourcesInner
-from typing import Optional, Set
+from typing import Optional, Set, Union
 from typing_extensions import Self
 from pydantic import AliasGenerator
 from pydantic.alias_generators import to_camel
@@ -103,13 +103,20 @@ class ApplyOTTResponse(BaseModel, BaseSdkModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+    def from_dict(cls, obj: Optional[Union[Dict[str, Any], str]]) -> Optional[Self]:
         """Create an instance of ApplyOTTResponse from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return cls.model_validate(obj)
+            # If it's a string (JSON), try to parse it
+            if isinstance(obj, str):
+                try:
+                    obj = json.loads(obj)
+                except json.JSONDecodeError:
+                    return cls.model_validate(obj)
+            else:
+                return cls.model_validate(obj)
 
         _obj = cls.model_validate({
             "responseCode": obj.get("responseCode"),

{dana_python-2.0.0 → dana_python-2.1.0}/dana/widget/v1/models/apply_ott_response_user_resources_inner.py

@@ -37,7 +37,7 @@ from dana.base.model import BaseSdkModel
 from pydantic import BaseModel, ConfigDict, Field
 from typing import Any, ClassVar, Dict, List, Optional
 from typing_extensions import Annotated
-from typing import Optional, Set
+from typing import Optional, Set, Union
 from typing_extensions import Self
 from pydantic import AliasGenerator
 from pydantic.alias_generators import to_camel
@@ -93,13 +93,20 @@ class ApplyOTTResponseUserResourcesInner(BaseModel, BaseSdkModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+    def from_dict(cls, obj: Optional[Union[Dict[str, Any], str]]) -> Optional[Self]:
         """Create an instance of ApplyOTTResponseUserResourcesInner from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return cls.model_validate(obj)
+            # If it's a string (JSON), try to parse it
+            if isinstance(obj, str):
+                try:
+                    obj = json.loads(obj)
+                except json.JSONDecodeError:
+                    return cls.model_validate(obj)
+            else:
+                return cls.model_validate(obj)
 
         _obj = cls.model_validate({
             "resourceType": obj.get("resourceType"),

{dana_python-2.0.0 → dana_python-2.1.0}/dana/widget/v1/models/apply_token_authorization_code_request.py

@@ -37,7 +37,7 @@ from dana.base.model import BaseSdkModel
 from pydantic import BaseModel, ConfigDict, Field, field_validator
 from typing import Any, ClassVar, Dict, List, Optional
 from typing_extensions import Annotated
-from typing import Optional, Set
+from typing import Optional, Set, Union
 from typing_extensions import Self
 from pydantic import AliasGenerator
 from pydantic.alias_generators import to_camel
@@ -102,13 +102,20 @@ class ApplyTokenAuthorizationCodeRequest(BaseModel, BaseSdkModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+    def from_dict(cls, obj: Optional[Union[Dict[str, Any], str]]) -> Optional[Self]:
         """Create an instance of ApplyTokenAuthorizationCodeRequest from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return cls.model_validate(obj)
+            # If it's a string (JSON), try to parse it
+            if isinstance(obj, str):
+                try:
+                    obj = json.loads(obj)
+                except json.JSONDecodeError:
+                    return cls.model_validate(obj)
+            else:
+                return cls.model_validate(obj)
 
         _obj = cls.model_validate({
             "additionalInfo": obj.get("additionalInfo"),

{dana_python-2.0.0 → dana_python-2.1.0}/dana/widget/v1/models/apply_token_refresh_token_request.py

@@ -37,7 +37,7 @@ from dana.base.model import BaseSdkModel
 from pydantic import BaseModel, ConfigDict, Field, field_validator
 from typing import Any, ClassVar, Dict, List, Optional
 from typing_extensions import Annotated
-from typing import Optional, Set
+from typing import Optional, Set, Union
 from typing_extensions import Self
 from pydantic import AliasGenerator
 from pydantic.alias_generators import to_camel
@@ -102,13 +102,20 @@ class ApplyTokenRefreshTokenRequest(BaseModel, BaseSdkModel):
         return _dict
 
     @classmethod
-    def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
+    def from_dict(cls, obj: Optional[Union[Dict[str, Any], str]]) -> Optional[Self]:
         """Create an instance of ApplyTokenRefreshTokenRequest from a dict"""
         if obj is None:
             return None
 
         if not isinstance(obj, dict):
-            return cls.model_validate(obj)
+            # If it's a string (JSON), try to parse it
+            if isinstance(obj, str):
+                try:
+                    obj = json.loads(obj)
+                except json.JSONDecodeError:
+                    return cls.model_validate(obj)
+            else:
+                return cls.model_validate(obj)
 
         _obj = cls.model_validate({
             "additionalInfo": obj.get("additionalInfo"),