update

Author: msyyc

packages/http-client-python/generator/pygen/__init__.py

@@ -16,7 +16,6 @@
 
 from ._version import VERSION
 
-
 __version__ = VERSION
 _LOGGER = logging.getLogger(__name__)
 

packages/http-client-python/generator/pygen/codegen/__init__.py

@@ -13,7 +13,6 @@
 from .models.code_model import CodeModel
 from .serializers import JinjaSerializer
 
-
 _LOGGER = logging.getLogger(__name__)
 
 

packages/http-client-python/generator/pygen/codegen/models/base.py

@@ -7,7 +7,6 @@
 from abc import ABC, abstractmethod
 from .imports import FileImport
 
-
 if TYPE_CHECKING:
     from .code_model import CodeModel
     from .model_type import ModelType

packages/http-client-python/generator/pygen/codegen/models/enum_type.py

@@ -10,7 +10,6 @@
 from .utils import NamespaceType, add_to_pylint_disable
 from ...utils import NAME_LENGTH_LIMIT
 
-
 if TYPE_CHECKING:
     from .code_model import CodeModel
 

packages/http-client-python/generator/pygen/codegen/serializers/sample_serializer.py

@@ -20,6 +20,7 @@
     BodyParameter,
     FileImport,
 )
+from .utils import json_dumps_template, get_sub_type, get_model_type
 
 _LOGGER = logging.getLogger(__name__)
 
@@ -102,14 +103,18 @@ def _operation_params(self) -> dict[str, Any]:
             for p in (self.operation.parameters.positional + self.operation.parameters.keyword_only)
             if not p.client_default_value
         ]
-        failure_info = "fail to find required param named {}"
         operation_params = {}
         for param in params:
             if not param.optional:
                 param_value = self.sample_params.get(param.wire_name)
                 if not param_value:
-                    raise Exception(failure_info.format(param.client_name))  # pylint: disable=broad-exception-raised
-                operation_params[param.client_name] = self.handle_param(param, param_value)
+                    model_type = get_model_type(param.type)
+                    param_type = get_sub_type(model_type) if model_type else param.type
+                    operation_params[param.client_name] = json_dumps_template(
+                        param_type.get_json_template_representation()
+                    )
+                else:
+                    operation_params[param.client_name] = self.handle_param(param, param_value)
         return operation_params
 
     def _operation_group_name(self) -> str:

packages/http-client-python/generator/pygen/codegen/serializers/test_serializer.py

@@ -3,7 +3,7 @@
 # Licensed under the MIT License. See License.txt in the project root for
 # license information.
 # --------------------------------------------------------------------------
-from typing import Any, Optional
+from typing import Any
 from jinja2 import Environment
 
 from .import_serializer import FileImportSerializer
@@ -14,12 +14,9 @@
     OperationGroup,
     Client,
     OperationType,
-    ModelType,
-    BaseType,
-    CombinedType,
     FileImport,
 )
-from .utils import json_dumps_template
+from .utils import json_dumps_template, get_sub_type, get_model_type
 
 
 def is_lro(operation_type: str) -> bool:
@@ -226,25 +223,12 @@ def breadth_search_operation_group(self) -> list[list[OperationGroup]]:
                 queue.extend([current + [og] for og in current[-1].operation_groups])
         return result
 
-    def get_sub_type(self, param_type: ModelType) -> ModelType:
-        if param_type.discriminated_subtypes:
-            for item in param_type.discriminated_subtypes.values():
-                return self.get_sub_type(item)
-        return param_type
-
-    def get_model_type(self, param_type: BaseType) -> Optional[ModelType]:
-        if isinstance(param_type, ModelType):
-            return param_type
-        if isinstance(param_type, CombinedType):
-            return param_type.target_model_subtype((ModelType,))
-        return None
-
     def get_operation_params(self, operation: OperationType) -> dict[str, Any]:
         operation_params = {}
         required_params = [p for p in operation.parameters.method if not p.optional]
         for param in required_params:
-            model_type = self.get_model_type(param.type)
-            param_type = self.get_sub_type(model_type) if model_type else param.type
+            model_type = get_model_type(param.type)
+            param_type = get_sub_type(model_type) if model_type else param.type
             operation_params[param.client_name] = json_dumps_template(param_type.get_json_template_representation())
         return operation_params
 

packages/http-client-python/generator/pygen/codegen/serializers/utils.py

@@ -7,6 +7,23 @@
 from typing import Optional, Any
 from pathlib import Path
 
+from ..models import ModelType, BaseType, CombinedType
+
+
+def get_sub_type(param_type: ModelType) -> ModelType:
+    if param_type.discriminated_subtypes:
+        for item in param_type.discriminated_subtypes.values():
+            return get_sub_type(item)
+    return param_type
+
+
+def get_model_type(param_type: BaseType) -> Optional[ModelType]:
+    if isinstance(param_type, ModelType):
+        return param_type
+    if isinstance(param_type, CombinedType):
+        return param_type.target_model_subtype((ModelType,))
+    return None
+
 
 def method_signature_and_response_type_annotation_template(
     *,

packages/http-client-python/generator/pygen/preprocess/__init__.py

@@ -4,6 +4,7 @@
 # license information.
 # --------------------------------------------------------------------------
 """The preprocessing autorest plugin."""
+
 import copy
 from typing import Callable, Any, Optional