@typespec/http-client-python 0.13.0-dev.2 → 0.13.0-dev.3

package/generator/pygen/codegen/templates/packaging_templates/setup.py.jinja2

@@ -5,18 +5,18 @@
 {{ code_model.license_header }}
 {% endif %}
 
-{% if package_mode %}
+{% if options["package-mode"] %}
 
 import os
 import re
 {% endif %}
 from setuptools import setup, find_packages
 
-{% set package_name = package_name or code_model.clients[0].name %}
+{% set package_name = options["package-name"] or code_model.clients[0].name %}
 
 PACKAGE_NAME = "{{ package_name|lower }}"
-{% if package_mode %}
-PACKAGE_PPRINT_NAME = "{{ package_pprint_name }}"
+{% if options["package-mode"] %}
+PACKAGE_PPRINT_NAME = "{{ options["package-pprint-name"] }}"
 {% if code_model.is_tsp %}
 PACKAGE_NAMESPACE = "{{ code_model.namespace|lower }}"
 
@@ -40,7 +40,7 @@ if not version:
 {% set author_email = "azpysdkhelp@microsoft.com" %}
 {% set url = "https://github.com/Azure/azure-sdk-for-python/tree/main/sdk" %}
 {% else %}
-version = "{{ package_version }}"
+version = "{{ options.get("package-version", "unknown") }}"
 {% set description = "\"%s\""|format(package_name) %}
 {% set long_description = code_model.description %}
 {% set author_email = "" %}
@@ -52,7 +52,7 @@ setup(
     name=PACKAGE_NAME,
     version=version,
     description={{ description }},
-    {% if package_mode %}
+    {% if options["package-mode"] %}
     long_description=open("README.md", "r").read(),
     long_description_content_type="text/markdown",
     license="MIT License",
@@ -63,7 +63,7 @@ setup(
     url="{{ url }}",
     keywords="azure, azure sdk",
     {% endif %}
-    {% if package_mode %}
+    {% if options["package-mode"] %}
     classifiers=[
         "Development Status :: {{ dev_status }}",
         "Programming Language :: Python",
@@ -100,7 +100,7 @@ setup(
         {% else %}
         "isodate>={{ VERSION_MAP["isodate"] }}",
         {% endif %}
-        {% if azure_arm %}
+        {% if code_model.options["azure-arm"] %}
         "azure-mgmt-core>={{ VERSION_MAP["azure-mgmt-core"] }}",
         {% elif code_model.is_azure_flavor %}
         "azure-core>={{ VERSION_MAP["azure-core"] }}",
@@ -109,7 +109,7 @@ setup(
         {% endif %}
         "typing-extensions>={{ VERSION_MAP['typing-extensions'] }}",
     ],
-    {% if package_mode %}
+    {% if options["package-mode"] %}
     python_requires=">={{  MIN_PYTHON_VERSION }}",
     {% else %}
     long_description="""\

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

@@ -1,7 +1,7 @@
 {% import 'keywords.jinja2' as keywords with context %}
 {% import 'operation_tools.jinja2' as op_tools with context %}
 {{ request_builder_serializer.method_signature_and_response_type_annotation(request_builder) }}
-{% if code_model.options["builders_visibility"] == "public" %}
+{% if code_model.options["builders-visibility"] == "public" %}
     {{ op_tools.description(request_builder, request_builder_serializer) | indent }}
 {% endif %}
 {% if not request_builder.is_overload %}

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

@@ -11,7 +11,7 @@
 {% if "credential" in client_params and aad_token in client_params["credential"] %}
     pip install azure-identity
 {% endif %}
-    pip install {{ (code_model.options["package_name"] or code_model.clients[0].name)|lower }}
+    pip install {{ (code_model.options.get("package-name") or code_model.clients[0].name)|lower }}
 # USAGE
     python {{ file_name }}
     {% if "credential" in client_params and aad_token in client_params["credential"] %}

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

@@ -1,5 +1,5 @@
 {% set prefix_lower = test.prefix|lower %}
-{% set client_var = "self.client" if code_model.options["azure_arm"] else "client" %}
+{% set client_var = "self.client" if code_model.options["azure-arm"] else "client" %}
 {% set async = "async " if test.async_mode else "" %}
 {% set async_suffix = "_async" if test.async_mode else "" %}
 # coding=utf-8
@@ -9,13 +9,13 @@
 import pytest
 {{ imports }}
 
-{% if code_model.options["azure_arm"] %}
+{% if code_model.options["azure-arm"] %}
 AZURE_LOCATION = "eastus"
 {% endif %}
 
 @pytest.mark.skip("you may need to update the auto-generated test case before run it")
 class {{ test.test_class_name }}({{ test.base_test_class_name }}):
-{% if code_model.options["azure_arm"] %}
+{% if code_model.options["azure-arm"] %}
     def setup_method(self, method):
         {% if test.async_mode %}
         self.client = self.create_mgmt_client({{ test.client_name }}, is_async=True)
@@ -24,13 +24,13 @@ class {{ test.test_class_name }}({{ test.base_test_class_name }}):
         {% endif %}
 {% endif %}
 {% for testcase in test.testcases %}
-    {% if code_model.options["azure_arm"] %}
+    {% if code_model.options["azure-arm"] %}
     @{{ test.preparer_name }}(location=AZURE_LOCATION)
     {% else %}
     @{{ test.preparer_name }}()
     {% endif %}
     @recorded_by_proxy{{ async_suffix }}
-    {% if code_model.options["azure_arm"] %}
+    {% if code_model.options["azure-arm"] %}
     {{ async }}def test_{{ testcase.name }}(self, resource_group):
     {% else %}
     {{ async }}def test_{{ testcase.name }}(self, {{ prefix_lower }}_endpoint):
@@ -38,7 +38,7 @@ class {{ test.test_class_name }}({{ test.base_test_class_name }}):
     {% endif %}
         {{testcase.response }}{{ client_var }}{{ testcase.operation_group_prefix }}.{{ testcase.operation.name }}(
             {% for key, value in testcase.params.items() %}
-            {% if code_model.options["azure_arm"] and key == "resource_group_name" %}
+            {% if code_model.options["azure-arm"] and key == "resource_group_name" %}
             {{ key }}=resource_group.name,
             {% else %}
             {{ key }}={{ value|indent(12) }},

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

@@ -3,4 +3,4 @@
 {{ code_model.license_header }}
 {% endif %}
 
-VERSION = "{{ code_model.options['package_version'] }}"
+VERSION = "{{ code_model.options.get("package-version") }}"

package/generator/pygen/preprocess/__init__.py

@@ -210,7 +210,7 @@ class PreProcessPlugin(YamlUpdatePlugin):
             if not (self.is_tsp and has_multi_part_content_type(body_parameter)):
                 body_parameter["type"]["types"].append(KNOWN_TYPES["binary"])
 
-            if origin_type == "model" and is_dpg_model and self.models_mode == "dpg":
+            if origin_type == "model" and is_dpg_model and self.options["models-mode"] == "dpg":
                 body_parameter["type"]["types"].insert(1, KNOWN_TYPES["any-object"])
             code_model["types"].append(body_parameter["type"])
 

package/generator/pygen/utils.py

@@ -7,6 +7,10 @@ from typing import Any, Dict, Tuple, List
 import re
 import argparse
 
+SWAGGER_PACKAGE_MODE = ["mgmtplane", "dataplane"]  # for backward compatibility
+TYPESPEC_PACKAGE_MODE = ["azure-mgmt", "azure-dataplane", "generic"]
+VALID_PACKAGE_MODE = SWAGGER_PACKAGE_MODE + TYPESPEC_PACKAGE_MODE
+
 
 def update_enum_value(name: str, value: Any, description: str, enum_type: Dict[str, Any]) -> Dict[str, Any]:
     return {

package/generator/test/unittests/test_optional_return_type.py

@@ -36,11 +36,11 @@ def code_model():
             "namespace": "namespace",
         },
         options={
-            "show_send_request": True,
-            "builders_visibility": "public",
-            "show_operations": True,
-            "models_mode": "dpg",
-            "version_tolerant": True,
+            "show-send-request": True,
+            "builders-visibility": "public",
+            "show-operations": True,
+            "models-mode": "dpg",
+            "version-tolerant": True,
         },
     )
 

package/generator/test/unittests/test_parameter_ordering.py

@@ -23,11 +23,11 @@ def get_code_model():
             "namespace": "namespace",
         },
         options={
-            "show_send_request": True,
-            "builders_visibility": "public",
-            "show_operations": True,
-            "models_mode": "dpg",
-            "only_path_and_body_params_positional": True,
+            "show-send-request": True,
+            "builders-visibility": "public",
+            "show-operations": True,
+            "models-mode": "dpg",
+            "only-path-and-body-params-positional": True,
         },
     )
 

package/generator/test/unittests/test_sort_schema.py

@@ -23,10 +23,10 @@ def get_code_model():
             "namespace": "namespace",
         },
         options={
-            "show_send_request": True,
-            "builders_visibility": "public",
-            "show_operations": True,
-            "models_mode": "dpg",
+            "show-send-request": True,
+            "builders-visibility": "public",
+            "show-operations": True,
+            "models-mode": "dpg",
         },
     )
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/http-client-python",
-  "version": "0.13.0-dev.2",
+  "version": "0.13.0-dev.3",
   "author": "Microsoft Corporation",
   "description": "TypeSpec emitter for Python SDKs",
   "homepage": "https://typespec.io",