@autorest/python 6.41.0 → 6.41.2

package/generator/build/lib/pygen/codegen/models/operation.py

@@ -198,7 +198,11 @@ class OperationBase(  # pylint: disable=too-many-public-methods,too-many-instanc
             return None
         exception_schema = default_exceptions[0].type
         if isinstance(exception_schema, ModelType):
-            return exception_schema.type_annotation(skip_quote=True, serialize_namespace=serialize_namespace)
+            pylint_disable = "  # pylint: disable=protected-access" if exception_schema.internal else ""
+            return (
+                exception_schema.type_annotation(skip_quote=True, serialize_namespace=serialize_namespace)
+                + pylint_disable
+            )
         return None if self.code_model.options["models-mode"] == "dpg" else "'object'"
 
     @property

package/generator/build/lib/pygen/codegen/serializers/builder_serializer.py

@@ -1014,7 +1014,9 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
                 retval.extend(deserialize_code)
         return retval
 
-    def handle_error_response(self, builder: OperationType) -> list[str]:
+    def handle_error_response(  # pylint: disable=too-many-statements, too-many-branches
+        self, builder: OperationType
+    ) -> list[str]:
         async_await = "await " if self.async_mode else ""
         retval = [f"if response.status_code not in {str(builder.success_status_codes)}:"]
         response_read = [
@@ -1036,6 +1038,10 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
             retval.append("    error = None")
             for e in builder.non_default_errors:
                 # single status code
+                if isinstance(e.type, ModelType) and e.type.internal:
+                    pylint_disable = "  # pylint: disable=protected-access"
+                else:
+                    pylint_disable = ""
                 if isinstance(e.status_codes[0], int):
                     for status_code in e.status_codes:
                         retval.append(f"    {condition} response.status_code == {status_code}:")
@@ -1043,10 +1049,13 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
                             is_operation_file=True, skip_quote=True, serialize_namespace=self.serialize_namespace
                         )
                         if self.code_model.options["models-mode"] == "dpg":
-                            retval.append(f"        error = _failsafe_deserialize({type_annotation},  response)")
+                            retval.append(
+                                f"        error = _failsafe_deserialize({type_annotation},{pylint_disable}\n  response)"
+                            )
                         else:
                             retval.append(
-                                f"        error = self._deserialize.failsafe_deserialize({type_annotation}, "
+                                "        error = self._deserialize.failsafe_deserialize("
+                                f"{type_annotation},{pylint_disable}\n "
                                 "pipeline_response)"
                             )
                         # add build-in error type
@@ -1078,12 +1087,19 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
                     )
                     if self.code_model.options["models-mode"] == "dpg":
                         if xml_serializable(str(e.default_content_type)):
-                            retval.append(f"        error = _failsafe_deserialize_xml({type_annotation}, response)")
+                            retval.append(
+                                "        error = _failsafe_deserialize_xml("
+                                f"{type_annotation},{pylint_disable}\n  response)"
+                            )
                         else:
-                            retval.append(f"        error = _failsafe_deserialize({type_annotation}, response)")
+                            retval.append(
+                                "        error = _failsafe_deserialize("
+                                f"{type_annotation},{pylint_disable}\n  response)"
+                            )
                     else:
                         retval.append(
-                            f"        error = self._deserialize.failsafe_deserialize({type_annotation}, "
+                            "        error = self._deserialize.failsafe_deserialize("
+                            f"{type_annotation},{pylint_disable}\n  "
                             "pipeline_response)"
                         )
                     condition = "elif"

package/generator/build/lib/pygen/codegen/serializers/model_init_serializer.py

@@ -32,6 +32,9 @@ class ModelInitSerializer:
                         ", ".join(model_enum_name_intersection)
                     )
                 )
-
+        has_models = self.models
+        has_enums = self.enums
         template = self.env.get_template("model_init.py.jinja2")
-        return template.render(code_model=self.code_model, schemas=schemas, enums=enums)
+        return template.render(
+            code_model=self.code_model, schemas=schemas, enums=enums, has_models=has_models, has_enums=has_enums
+        )

package/generator/build/lib/pygen/codegen/templates/model_init.py.jinja2

@@ -11,6 +11,9 @@ from .{{ code_model.models_filename }} import (  # type: ignore
     {{ schema }},
     {% endfor %}
 )
+{% elif has_models %}
+
+from . import _models
 {% endif %}
 {% if enums %}
 
@@ -19,6 +22,9 @@ from .{{ code_model.enums_filename }} import (  # type: ignore
     {{ enum }},
 {% endfor %}
 )
+{% elif has_enums %}
+
+from . import _enums
 {% endif %}
 {{ keywords.patch_imports() }}
 __all__ = [

package/generator/build/lib/pygen/codegen/templates/operation_tools.jinja2

@@ -19,7 +19,8 @@
     {% endfor %}
     {% for description in param_description_and_response_docstring %}
         {% if description %}
-{{ wrap_string(description, wrapstring='\n ') }}
+{% set description = wrap_string(description, wrapstring='\n ') %}
+{{ " " if description[0] != ":" and description[0] != " " else "" }}{{ description}}
         {% else %}
 
         {% endif %}

package/generator/pygen/codegen/models/operation.py

@@ -198,7 +198,11 @@ class OperationBase(  # pylint: disable=too-many-public-methods,too-many-instanc
             return None
         exception_schema = default_exceptions[0].type
         if isinstance(exception_schema, ModelType):
-            return exception_schema.type_annotation(skip_quote=True, serialize_namespace=serialize_namespace)
+            pylint_disable = "  # pylint: disable=protected-access" if exception_schema.internal else ""
+            return (
+                exception_schema.type_annotation(skip_quote=True, serialize_namespace=serialize_namespace)
+                + pylint_disable
+            )
         return None if self.code_model.options["models-mode"] == "dpg" else "'object'"
 
     @property

package/generator/pygen/codegen/serializers/builder_serializer.py

@@ -1014,7 +1014,9 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
                 retval.extend(deserialize_code)
         return retval
 
-    def handle_error_response(self, builder: OperationType) -> list[str]:
+    def handle_error_response(  # pylint: disable=too-many-statements, too-many-branches
+        self, builder: OperationType
+    ) -> list[str]:
         async_await = "await " if self.async_mode else ""
         retval = [f"if response.status_code not in {str(builder.success_status_codes)}:"]
         response_read = [
@@ -1036,6 +1038,10 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
             retval.append("    error = None")
             for e in builder.non_default_errors:
                 # single status code
+                if isinstance(e.type, ModelType) and e.type.internal:
+                    pylint_disable = "  # pylint: disable=protected-access"
+                else:
+                    pylint_disable = ""
                 if isinstance(e.status_codes[0], int):
                     for status_code in e.status_codes:
                         retval.append(f"    {condition} response.status_code == {status_code}:")
@@ -1043,10 +1049,13 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
                             is_operation_file=True, skip_quote=True, serialize_namespace=self.serialize_namespace
                         )
                         if self.code_model.options["models-mode"] == "dpg":
-                            retval.append(f"        error = _failsafe_deserialize({type_annotation},  response)")
+                            retval.append(
+                                f"        error = _failsafe_deserialize({type_annotation},{pylint_disable}\n  response)"
+                            )
                         else:
                             retval.append(
-                                f"        error = self._deserialize.failsafe_deserialize({type_annotation}, "
+                                "        error = self._deserialize.failsafe_deserialize("
+                                f"{type_annotation},{pylint_disable}\n "
                                 "pipeline_response)"
                             )
                         # add build-in error type
@@ -1078,12 +1087,19 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
                     )
                     if self.code_model.options["models-mode"] == "dpg":
                         if xml_serializable(str(e.default_content_type)):
-                            retval.append(f"        error = _failsafe_deserialize_xml({type_annotation}, response)")
+                            retval.append(
+                                "        error = _failsafe_deserialize_xml("
+                                f"{type_annotation},{pylint_disable}\n  response)"
+                            )
                         else:
-                            retval.append(f"        error = _failsafe_deserialize({type_annotation}, response)")
+                            retval.append(
+                                "        error = _failsafe_deserialize("
+                                f"{type_annotation},{pylint_disable}\n  response)"
+                            )
                     else:
                         retval.append(
-                            f"        error = self._deserialize.failsafe_deserialize({type_annotation}, "
+                            "        error = self._deserialize.failsafe_deserialize("
+                            f"{type_annotation},{pylint_disable}\n  "
                             "pipeline_response)"
                         )
                     condition = "elif"

package/generator/pygen/codegen/serializers/model_init_serializer.py

@@ -32,6 +32,9 @@ class ModelInitSerializer:
                         ", ".join(model_enum_name_intersection)
                     )
                 )
-
+        has_models = self.models
+        has_enums = self.enums
         template = self.env.get_template("model_init.py.jinja2")
-        return template.render(code_model=self.code_model, schemas=schemas, enums=enums)
+        return template.render(
+            code_model=self.code_model, schemas=schemas, enums=enums, has_models=has_models, has_enums=has_enums
+        )

package/generator/pygen/codegen/templates/model_init.py.jinja2

@@ -11,6 +11,9 @@ from .{{ code_model.models_filename }} import (  # type: ignore
     {{ schema }},
     {% endfor %}
 )
+{% elif has_models %}
+
+from . import _models
 {% endif %}
 {% if enums %}
 
@@ -19,6 +22,9 @@ from .{{ code_model.enums_filename }} import (  # type: ignore
     {{ enum }},
 {% endfor %}
 )
+{% elif has_enums %}
+
+from . import _enums
 {% endif %}
 {{ keywords.patch_imports() }}
 __all__ = [

package/generator/pygen/codegen/templates/operation_tools.jinja2

@@ -19,7 +19,8 @@
     {% endfor %}
     {% for description in param_description_and_response_docstring %}
         {% if description %}
-{{ wrap_string(description, wrapstring='\n ') }}
+{% set description = wrap_string(description, wrapstring='\n ') %}
+{{ " " if description[0] != ":" and description[0] != " " else "" }}{{ description}}
         {% else %}
 
         {% endif %}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@autorest/python",
-  "version": "6.41.0",
+  "version": "6.41.2",
   "description": "The Python extension for generators in AutoRest.",
   "main": "index.js",
   "repository": {
@@ -19,7 +19,7 @@
   },
   "homepage": "https://github.com/Azure/autorest.python/blob/main/README.md",
   "dependencies": {
-    "@typespec/http-client-python": "~0.18.0",
+    "@typespec/http-client-python": "~0.19.0",
     "@autorest/system-requirements": "~1.0.2",
     "fs-extra": "~11.2.0",
     "tsx": "~4.19.1"