@azure-tools/typespec-python 0.31.0 → 0.32.0

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

@@ -284,8 +284,8 @@ class _BuilderBaseSerializer(Generic[BuilderType]):
         return description_list
 
     @staticmethod
-    def line_too_long(docs: List[str]) -> bool:
-        return any(len(line) > 120 for line in docs)
+    def line_too_long(docs: List[str], indentation: int = 0) -> bool:
+        return any(len(line) > (120 - indentation) for line in docs)
 
     def example_template(self, builder: BuilderType) -> List[str]:
         template = []
@@ -1089,7 +1089,9 @@ class _OperationSerializer(_BuilderBaseSerializer[OperationType]):
         return retval
 
     def error_map(self, builder: OperationType) -> List[str]:
-        retval = ["error_map: MutableMapping[int, Type[HttpResponseError]] = {"]
+        retval = [
+            "error_map: MutableMapping[int, Type[HttpResponseError]] = { # pylint: disable=unsubscriptable-object"
+        ]
         if builder.non_default_errors:
             if not 401 in builder.non_default_error_status_codes:
                 retval.append("    401: ClientAuthenticationError,")

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

@@ -255,11 +255,19 @@ class DpgModelSerializer(_ModelSerializer):
             args.append(f"xml={prop.xml_metadata}")
 
         field = "rest_discriminator" if prop.is_discriminator else "rest_field"
-        type_ignore = prop.is_discriminator and isinstance(prop.type, (ConstantType, EnumValue)) and prop.type.value
-        return (
-            f"{prop.client_name}: {prop.type_annotation()} ="
-            f' {field}({", ".join(args)}){"  # type: ignore" if type_ignore else ""}'
+        type_ignore = (
+            "  # type: ignore"
+            if prop.is_discriminator and isinstance(prop.type, (ConstantType, EnumValue)) and prop.type.value
+            else ""
+        )
+        generated_code = f'{prop.client_name}: {prop.type_annotation()} = {field}({", ".join(args)})'
+        # there is 4 spaces indentation so original line length limit 120 - 4 = 116
+        pylint_disable = (
+            " # pylint: disable=line-too-long"
+            if len(generated_code) <= 116 < (len(generated_code) + len(type_ignore))
+            else ""
         )
+        return f"{generated_code}{type_ignore}{pylint_disable}"
 
     def initialize_properties(self, model: ModelType) -> List[str]:
         init_args = []

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

@@ -1130,7 +1130,7 @@ def _deserialize_xml(
     deserializer: typing.Any,
     value: str,
 ) -> typing.Any:
-    element = ET.fromstring(value)
+    element = ET.fromstring(value) # nosec
     return _deserialize(deserializer, element)
 
 

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

@@ -53,7 +53,7 @@
     {% set need_init = (not model.internal) and (serializer.init_line(model) or model.discriminator)%}
     {% if need_init %}
     @overload
-    def __init__(
+    def __init__({{ model.init_pylint_disable }}
         self,
         {% for param_signature in serializer.init_line(model) %}
         {{ param_signature }}

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

@@ -2,10 +2,17 @@
 
 {% macro description(builder, serializer) %}
 {% set example_template = serializer.example_template(builder) %}
+{% set param_description_and_response_docstring = serializer.param_description_and_response_docstring(builder) %}
+{% set ns = namespace(line_too_long=false) %}
+{% for item in param_description_and_response_docstring %}
+    {% if item and serializer.line_too_long(wrap_string(item, wrapstring='\n ').split('\n'), 8) %}
+        {% set ns.line_too_long = true %}
+    {% endif %}
+{% endfor %}
     {% for description in serializer.description_and_summary(builder) %}
         {% if description %}
 {% set description = wrap_string(description, wrapstring='\n') %}
-            {% if serializer.line_too_long(example_template) and loop.first %}
+            {% if (serializer.line_too_long(example_template) or ns.line_too_long) and loop.first %}
 # pylint: disable=line-too-long
             {% endif %}
 {{ '"""' + description if loop.first else description }}
@@ -13,7 +20,7 @@
 
         {% endif %}
     {% endfor %}
-    {% for description in serializer.param_description_and_response_docstring(builder) %}
+    {% for description in param_description_and_response_docstring %}
         {% if description %}
 {{ wrap_string(description, wrapstring='\n ') }}
         {% else %}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@azure-tools/typespec-python",
-  "version": "0.31.0",
+  "version": "0.32.0",
   "author": "Microsoft Corporation",
   "description": "TypeSpec emitter for Python SDKs",
   "homepage": "https://github.com/Azure/autorest.python",
@@ -33,26 +33,26 @@
     "scripts/**"
   ],
   "peerDependencies": {
-    "@azure-tools/typespec-azure-core": ">=0.45.0 <1.0.0",
-    "@azure-tools/typespec-azure-resource-manager": ">=0.45.0 <1.0.0",
-    "@azure-tools/typespec-autorest": ">=0.45.0 <1.0.0",
-    "@azure-tools/typespec-client-generator-core": ">=0.45.4 <1.0.0",
-    "@azure-tools/typespec-azure-rulesets": ">=0.45.0 <3.0.0",
-    "@typespec/compiler": ">=0.59.1 <1.0.0",
-    "@typespec/http": ">=0.59.0 <1.0.0",
-    "@typespec/rest": ">=0.59.0 <1.0.0",
-    "@typespec/versioning": ">=0.59.0 <1.0.0",
-    "@typespec/openapi": ">=0.59.0 <1.0.0"
+    "@azure-tools/typespec-azure-core": ">=0.46.0 <1.0.0",
+    "@azure-tools/typespec-azure-resource-manager": ">=0.46.0 <1.0.0",
+    "@azure-tools/typespec-autorest": ">=0.46.0 <1.0.0",
+    "@azure-tools/typespec-client-generator-core": ">=0.46.0 <1.0.0",
+    "@azure-tools/typespec-azure-rulesets": ">=0.46.0 <3.0.0",
+    "@typespec/compiler": ">=0.60.0 <1.0.0",
+    "@typespec/http": ">=0.60.0 <1.0.0",
+    "@typespec/rest": ">=0.60.0 <1.0.0",
+    "@typespec/versioning": ">=0.60.0 <1.0.0",
+    "@typespec/openapi": ">=0.60.0 <1.0.0"
   },
   "dependencies": {
     "js-yaml": "~4.1.0",
-    "@typespec/openapi3": "~0.59.0",
+    "@typespec/openapi3": "~0.60.0",
     "semver": "~7.6.2",
     "tsx": "4.17.0"
   },
   "devDependencies": {
-    "@azure-tools/typespec-azure-resource-manager": "~0.45.0",
-    "@azure-tools/typespec-autorest": "~0.45.0",
+    "@azure-tools/typespec-azure-resource-manager": "~0.46.0",
+    "@azure-tools/typespec-autorest": "~0.46.0",
     "@azure-tools/cadl-ranch-expect": "~0.15.3",
     "@azure-tools/cadl-ranch-specs": "~0.37.1",
     "@types/js-yaml": "~4.0.5",
@@ -60,18 +60,18 @@
     "@types/yargs": "17.0.32",
     "@types/semver": "7.5.8",
     "@typespec/eslint-config-typespec": "~0.55.0",
-    "@typespec/openapi": "~0.59.0",
+    "@typespec/openapi": "~0.60.0",
     "c8": "~7.13.0",
     "vitest": "^2.0.4",
     "rimraf": "~5.0.0",
     "typescript": "~5.5.4",
-    "@azure-tools/typespec-azure-core": "~0.45.0",
-    "@azure-tools/typespec-client-generator-core": "0.45.4",
-    "@typespec/compiler": "~0.59.1",
-    "@typespec/http": "~0.59.0",
-    "@typespec/rest": "~0.59.0",
-    "@typespec/versioning": "~0.59.0",
-    "@azure-tools/typespec-azure-rulesets": "0.45.0",
+    "@azure-tools/typespec-azure-core": "~0.46.0",
+    "@azure-tools/typespec-client-generator-core": "0.46.0",
+    "@typespec/compiler": "~0.60.0",
+    "@typespec/http": "~0.60.0",
+    "@typespec/rest": "~0.60.0",
+    "@typespec/versioning": "~0.60.0",
+    "@azure-tools/typespec-azure-rulesets": "0.46.0",
     "yargs": "~17.2.1",
     "chalk": "5.3.0"
   },