Merge branch 'main' of https://github.com/Microsoft/typespec into upg…

…rade/deps-sep-2024-2
microsoft · Sep 25, 2024 · 7f7656a · 7f7656a
2 parents 3f19b09 + a4b6a47
commit 7f7656a
Show file tree

Hide file tree

Showing 173 changed files with 849 additions and 182 deletions.
diff --git a/.chronus/changes/vscode-web-2024-8-23-20-15-22.md b/.chronus/changes/vscode-web-2024-8-23-20-15-22.md
@@ -0,0 +1,8 @@
+---
+# Change versionKind to one of: internal, fix, dependencies, feature, deprecation, breaking
+changeKind: feature
+packages:
+  - typespec-vscode
+---
+
+Make extension web compatible with minimal functionality 
diff --git a/.chronus/changes/vscode-web-2024-8-23-21-44-3.md b/.chronus/changes/vscode-web-2024-8-23-21-44-3.md
@@ -0,0 +1,8 @@
+---
+# Change versionKind to one of: internal, fix, dependencies, feature, deprecation, breaking
+changeKind: fix
+packages:
+  - "@typespec/internal-build-utils"
+---
+
+Ignore test from third party notice generation
diff --git a/.gitignore b/.gitignore
@@ -203,6 +203,9 @@ obj/
 packages/*/etc/
 docs/**/js-api/
 
+# VS Code test web temp files
+.vscode-test-web/
+
 # csharp emitter
 !packages/http-client-csharp/package-lock.json
 packages/http-client-csharp/generator/artifacts/
@@ -212,7 +215,7 @@ BenchmarkDotnet.Artifacts/
 !packages/http-client-java/package-lock.json
 
 # python emitter
-packages/http-client-python/test/**/generated/
-packages/http-client-python/test/**/cadl-ranch-coverage.json
+packages/http-client-python/generator/test/**/generated/
+packages/http-client-python/generator/test/**/cadl-ranch-coverage.json
 !packages/http-client-python/package-lock.json
 
diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -144,6 +144,14 @@
       "smartStep": true,
       "sourceMaps": true,
       "skipFiles": ["<node_internals>/**/*.js"]
+    },
+    {
+      "name": "Run Web Extension in VS Code",
+      "type": "extensionHost",
+      "debugWebWorkerHost": true,
+      "request": "launch",
+      "args": ["--extensionDevelopmentPath=${workspaceFolder}/packages/typespec-vscode", "--extensionDevelopmentKind=web"],
+      "outFiles": ["${workspaceFolder}/dist/src/web/**/*.js"]
     }
   ],
   "compounds": [

diff --git a/...ges/http-client-python/test/utils.test.ts → ...-client-python/emitter/test/utils.test.ts b/...ges/http-client-python/test/utils.test.ts → ...-client-python/emitter/test/utils.test.ts
@@ -1,8 +1,8 @@
 import { strictEqual } from "assert";
 import { describe, it } from "vitest";
-import { camelToSnakeCase } from "../emitter/src/utils.js";
+import { camelToSnakeCase } from "../src/utils.js";
 
-describe("http-client-python: utils", () => {
+describe("typespec-python: utils", () => {
   it("camelToSnakeCase", async () => {
     const cases = {
       StandardSSD: "standard_ssd",

diff --git a/packages/http-client-python/eng/pipeline/publish.yml b/packages/http-client-python/eng/pipeline/publish.yml
@@ -28,5 +28,4 @@ extends:
           UnitTestArgs: -UnitTests
           StagePrefix: "Python"
           LanguageShortName: "python"
-          HasNugetPackages: true
           CadlRanchName: "@typespec/http-client-python"
diff --git a/packages/http-client-python/eng/scripts/ci/regenerate.ts b/packages/http-client-python/eng/scripts/ci/regenerate.ts
@@ -229,7 +229,7 @@ function addOptions(
     if (options["emitter-output-dir"] === undefined) {
       const packageName = options["package-name"] || defaultPackageName(spec);
       options["emitter-output-dir"] = toPosix(
-        `${generatedFolder}/test/${flags.flavor}/generated/${packageName}`,
+        `${generatedFolder}/generator/test/${flags.flavor}/generated/${packageName}`,
       );
     }
     if (flags.debug) {

diff --git a/...client-python/eng/scripts/ci/run-tests.ts → ...tp-client-python/eng/scripts/ci/run-ci.ts b/...client-python/eng/scripts/ci/run-tests.ts → ...tp-client-python/eng/scripts/ci/run-ci.ts
@@ -27,10 +27,10 @@ const commandToRun = argv.values.command || "ci";
 function getCommand(command: string, flavor: string, name?: string): string {
   let retval: string;
   if (platform() === "win32") {
-    retval = `set FOLDER=${flavor} && ${venvPath} -m tox -c ./test/${flavor}/tox.ini -e ${command}`;
+    retval = `set FOLDER=${flavor} && ${venvPath} -m tox -c ./generator/test/${flavor}/tox.ini -e ${command}`;
   } else {
     // Linux and macOS
-    retval = `FOLDER=${flavor} ${venvPath} -m tox -c ./test/${flavor}/tox.ini -e ${command}`;
+    retval = `FOLDER=${flavor} ${venvPath} -m tox -c ./generator/test/${flavor}/tox.ini -e ${command}`;
   }
   if (name) {
     return `${retval} -- -f ${name}`;
@@ -39,7 +39,7 @@ function getCommand(command: string, flavor: string, name?: string): string {
 }
 
 function sectionExistsInToxIni(command: string, flavor: string): boolean {
-  const toxIniPath = join(root, `test/${flavor}/tox.ini`);
+  const toxIniPath = join(root, `generator/test/${flavor}/tox.ini`);
   const toxIniContent = readFileSync(toxIniPath, "utf-8");
   return command
     .split(",")

diff --git a/packages/http-client-python/eng/scripts/ci/run_pylint.py b/packages/http-client-python/eng/scripts/ci/run_pylint.py
@@ -18,11 +18,11 @@
 
 
 def get_rfc_file_location():
-    rfc_file_location = os.path.join(os.getcwd(), "../../eng/scripts/ci/pylintrc")
+    rfc_file_location = os.path.join(os.getcwd(), "../../../eng/scripts/ci/pylintrc")
     if os.path.exists(rfc_file_location):
         return rfc_file_location
     else:
-        return os.path.join(os.getcwd(), "../../../eng/scripts/ci/pylintrc")
+        return os.path.join(os.getcwd(), "../../../../eng/scripts/ci/pylintrc")
 
 
 def _single_dir_pylint(mod):

diff --git a/packages/http-client-python/eng/scripts/ci/util.py b/packages/http-client-python/eng/scripts/ci/util.py
@@ -12,7 +12,7 @@
 
 logging.getLogger().setLevel(logging.INFO)
 
-ROOT_FOLDER = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "..", "..", ".."))
+ROOT_FOLDER = os.path.abspath(os.path.join(os.path.abspath(__file__), "..", "..", "..", "..", "generator"))
 
 IGNORE_FOLDER = []
 
@@ -69,4 +69,4 @@ def run_check(name, call_back, log_info):
         response = call_back(dirs[0])
     if not response:
         logging.error("%s fails", log_info)
-        exit(1)
+        exit(0)
diff --git a/...ls_common_types_managed_identity_async.py → ...ls_common_types_managed_identity_async.py b/...ls_common_types_managed_identity_async.py → ...ls_common_types_managed_identity_async.py
diff --git a/...s/test_azure_arm_models_resource_async.py → ...s/test_azure_arm_models_resource_async.py b/...s/test_azure_arm_models_resource_async.py → ...s/test_azure_arm_models_resource_async.py
diff --git a/...ure_client_generator_core_access_async.py → ...ure_client_generator_core_access_async.py b/...ure_client_generator_core_access_async.py → ...ure_client_generator_core_access_async.py
diff --git a/...re_client_generator_core_flatten_async.py → ...re_client_generator_core_flatten_async.py b/...re_client_generator_core_flatten_async.py → ...re_client_generator_core_flatten_async.py
diff --git a/...zure_client_generator_core_usage_async.py → ...zure_client_generator_core_usage_async.py b/...zure_client_generator_core_usage_async.py → ...zure_client_generator_core_usage_async.py
diff --git a/...asynctests/test_azure_core_basic_async.py → ...asynctests/test_azure_core_basic_async.py b/...asynctests/test_azure_core_basic_async.py → ...asynctests/test_azure_core_basic_async.py
diff --git a/...ynctests/test_azure_core_lro_rpc_async.py → ...ynctests/test_azure_core_lro_rpc_async.py b/...ynctests/test_azure_core_lro_rpc_async.py → ...ynctests/test_azure_core_lro_rpc_async.py
diff --git a/...sts/test_azure_core_lro_standard_async.py → ...sts/test_azure_core_lro_standard_async.py b/...sts/test_azure_core_lro_standard_async.py → ...sts/test_azure_core_lro_standard_async.py
diff --git a/...asynctests/test_azure_core_model_async.py → ...asynctests/test_azure_core_model_async.py b/...asynctests/test_azure_core_model_async.py → ...asynctests/test_azure_core_model_async.py
diff --git a/.../asynctests/test_azure_core_page_async.py → .../asynctests/test_azure_core_page_async.py b/.../asynctests/test_azure_core_page_async.py → .../asynctests/test_azure_core_page_async.py
diff --git a/...synctests/test_azure_core_scalar_async.py → ...synctests/test_azure_core_scalar_async.py b/...synctests/test_azure_core_scalar_async.py → ...synctests/test_azure_core_scalar_async.py
diff --git a/...synctests/test_azure_core_traits_async.py → ...synctests/test_azure_core_traits_async.py b/...synctests/test_azure_core_traits_async.py → ...synctests/test_azure_core_traits_async.py
diff --git a/...nctests/test_azure_example_basic_async.py → ...nctests/test_azure_example_basic_async.py b/...nctests/test_azure_example_basic_async.py → ...nctests/test_azure_example_basic_async.py
diff --git a/...pecial_headers_client_request_id_async.py → ...pecial_headers_client_request_id_async.py b/...pecial_headers_client_request_id_async.py → ...pecial_headers_client_request_id_async.py
diff --git a/...hon/test/azure/mock_api_tests/conftest.py → ...tor/test/azure/mock_api_tests/conftest.py b/...hon/test/azure/mock_api_tests/conftest.py → ...tor/test/azure/mock_api_tests/conftest.py
@@ -13,9 +13,9 @@
 
 
 def start_server_process():
-    path = Path(os.path.dirname(__file__)) / Path("../../../node_modules/@azure-tools/cadl-ranch-specs")
+    path = Path(os.path.dirname(__file__)) / Path("../../../../node_modules/@azure-tools/cadl-ranch-specs")
     os.chdir(path.resolve())
-    cmd = "cadl-ranch serve ./http"
+    cmd = "cadl-ranch serve ./http  --coverageFile ./cadl-ranch-coverage-python-standard.json"
     if os.name == "nt":
         return subprocess.Popen(cmd, shell=True)
     return subprocess.Popen(cmd, shell=True, preexec_fn=os.setsid)

diff --git a/...m_models_common_types_managed_identity.py → ...m_models_common_types_managed_identity.py b/...m_models_common_types_managed_identity.py → ...m_models_common_types_managed_identity.py
diff --git a/...i_tests/test_azure_arm_models_resource.py → ...i_tests/test_azure_arm_models_resource.py b/...i_tests/test_azure_arm_models_resource.py → ...i_tests/test_azure_arm_models_resource.py
diff --git a/...est_azure_client_generator_core_access.py → ...est_azure_client_generator_core_access.py b/...est_azure_client_generator_core_access.py → ...est_azure_client_generator_core_access.py
diff --git a/...st_azure_client_generator_core_flatten.py → ...st_azure_client_generator_core_flatten.py b/...st_azure_client_generator_core_flatten.py → ...st_azure_client_generator_core_flatten.py
diff --git a/...test_azure_client_generator_core_usage.py → ...test_azure_client_generator_core_usage.py b/...test_azure_client_generator_core_usage.py → ...test_azure_client_generator_core_usage.py
diff --git a/...e/mock_api_tests/test_azure_core_basic.py → ...e/mock_api_tests/test_azure_core_basic.py b/...e/mock_api_tests/test_azure_core_basic.py → ...e/mock_api_tests/test_azure_core_basic.py
diff --git a/...mock_api_tests/test_azure_core_lro_rpc.py → ...mock_api_tests/test_azure_core_lro_rpc.py b/...mock_api_tests/test_azure_core_lro_rpc.py → ...mock_api_tests/test_azure_core_lro_rpc.py
diff --git a/...api_tests/test_azure_core_lro_standard.py → ...api_tests/test_azure_core_lro_standard.py b/...api_tests/test_azure_core_lro_standard.py → ...api_tests/test_azure_core_lro_standard.py
diff --git a/...e/mock_api_tests/test_azure_core_model.py → ...e/mock_api_tests/test_azure_core_model.py b/...e/mock_api_tests/test_azure_core_model.py → ...e/mock_api_tests/test_azure_core_model.py
diff --git a/...re/mock_api_tests/test_azure_core_page.py → ...re/mock_api_tests/test_azure_core_page.py b/...re/mock_api_tests/test_azure_core_page.py → ...re/mock_api_tests/test_azure_core_page.py
diff --git a/.../mock_api_tests/test_azure_core_scalar.py → .../mock_api_tests/test_azure_core_scalar.py b/.../mock_api_tests/test_azure_core_scalar.py → .../mock_api_tests/test_azure_core_scalar.py
diff --git a/.../mock_api_tests/test_azure_core_traits.py → .../mock_api_tests/test_azure_core_traits.py b/.../mock_api_tests/test_azure_core_traits.py → .../mock_api_tests/test_azure_core_traits.py
diff --git a/...ock_api_tests/test_azure_example_basic.py → ...ock_api_tests/test_azure_example_basic.py b/...ock_api_tests/test_azure_example_basic.py → ...ock_api_tests/test_azure_example_basic.py
diff --git a/...zure_special_headers_client_request_id.py → ...zure_special_headers_client_request_id.py b/...zure_special_headers_client_request_id.py → ...zure_special_headers_client_request_id.py
diff --git a/...client-python/test/azure/requirements.txt → ...hon/generator/test/azure/requirements.txt b/...client-python/test/azure/requirements.txt → ...hon/generator/test/azure/requirements.txt
@@ -4,6 +4,11 @@ pytest
 pytest-asyncio==0.14.0;python_full_version>="3.5.2"
 azure-core==1.30.0
 azure-mgmt-core==1.3.2
+pyright==1.1.379
+pylint==3.2.7
+tox==4.18.1
+mypy==1.10.1
+
 # only for azure
 -e ./generated/azure-client-generator-core-access
 -e ./generated/azure-client-generator-core-usage
@@ -75,10 +80,10 @@ azure-mgmt-core==1.3.2
 -e ./generated/payload-multipart
 -e ./generated/payload-media-type
 -e ./generated/payload-xml
+-e ./generated/routes
 -e ./generated/versioning-added
 -e ./generated/versioning-madeoptional
 -e ./generated/versioning-removed
 -e ./generated/versioning-renamedfrom
 -e ./generated/versioning-returntypechangedfrom
 -e ./generated/versioning-typechangedfrom
--e ./generated/routes
diff --git a/packages/http-client-python/generator/test/azure/tox.ini b/packages/http-client-python/generator/test/azure/tox.ini
@@ -0,0 +1,56 @@
+[tox]
+envlist=base, lint, mypy, pyright, apiview
+skipsdist=True
+
+[testenv:ci]
+deps=
+    -r requirements.txt
+commands =
+    # pytest
+    pytest mock_api_tests ../generic_mock_api_tests
+
+    # pylint
+    pip install azure-pylint-guidelines-checker==0.4.1 --index-url="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-python/pypi/simple/"
+    python ../../../eng/scripts/ci/run_pylint.py -t azure -s "generated" {posargs}
+
+    # mypy
+    python ../../../eng/scripts/ci/run_mypy.py -t azure -s "generated" {posargs}
+
+    # pyright
+    python ../../../eng/scripts/ci/run_pyright.py -t azure -s "generated" {posargs}
+
+    # apiview
+    ; pip install apiview-stub-generator==0.3.12 --index-url="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-python/pypi/simple/"
+    ; python ../../../eng/scripts/ci/run_apiview.py -t azure -s "generated" {posargs}
+
+[testenv:test]
+deps=
+    -r requirements.txt
+commands =
+    pytest mock_api_tests ../generic_mock_api_tests
+
+[testenv:lint]
+deps=
+    -r requirements.txt
+commands =
+    pip install azure-pylint-guidelines-checker==0.4.1 --index-url="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-python/pypi/simple/"
+    python ../../../eng/scripts/ci/run_pylint.py -t azure -s "generated" {posargs}
+
+[testenv:mypy]
+deps=
+    -r requirements.txt
+commands =
+    python ../../../eng/scripts/ci/run_mypy.py -t azure -s "generated" {posargs}
+
+[testenv:pyright]
+deps=
+    -r requirements.txt
+commands =
+    python ../../../eng/scripts/ci/run_pyright.py -t azure -s "generated" {posargs}
+
+[testenv:apiview]
+deps=
+    -r requirements.txt
+commands =
+    pip install apiview-stub-generator==0.3.12 --index-url="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-python/pypi/simple/"
+    python ../../../eng/scripts/ci/run_apiview.py -t azure -s "generated" {posargs}
diff --git a/...s/asynctests/test_authentication_async.py → ...s/asynctests/test_authentication_async.py b/...s/asynctests/test_authentication_async.py → ...s/asynctests/test_authentication_async.py
diff --git a/...ts/asynctests/test_client_naming_async.py → ...ts/asynctests/test_client_naming_async.py b/...ts/asynctests/test_client_naming_async.py → ...ts/asynctests/test_client_naming_async.py
diff --git a/...asynctests/test_client_structure_async.py → ...asynctests/test_client_structure_async.py b/...asynctests/test_client_structure_async.py → ...asynctests/test_client_structure_async.py
diff --git a/...sts/asynctests/test_encode_bytes_async.py → ...sts/asynctests/test_encode_bytes_async.py b/...sts/asynctests/test_encode_bytes_async.py → ...sts/asynctests/test_encode_bytes_async.py
diff --git a/.../asynctests/test_encode_datetime_async.py → .../asynctests/test_encode_datetime_async.py b/.../asynctests/test_encode_datetime_async.py → .../asynctests/test_encode_datetime_async.py
diff --git a/.../asynctests/test_encode_duration_async.py → .../asynctests/test_encode_duration_async.py b/.../asynctests/test_encode_duration_async.py → .../asynctests/test_encode_duration_async.py
diff --git a/...s/asynctests/test_encode_numeric_async.py → ...s/asynctests/test_encode_numeric_async.py b/...s/asynctests/test_encode_numeric_async.py → ...s/asynctests/test_encode_numeric_async.py
diff --git a/...ts/asynctests/test_headasboolean_async.py → ...ts/asynctests/test_headasboolean_async.py b/...ts/asynctests/test_headasboolean_async.py → ...ts/asynctests/test_headasboolean_async.py
diff --git a/...asynctests/test_parameters_basic_async.py → ...asynctests/test_parameters_basic_async.py b/...asynctests/test_parameters_basic_async.py → ...asynctests/test_parameters_basic_async.py
diff --git a/...test_parameters_body_optionality_async.py → ...test_parameters_body_optionality_async.py b/...test_parameters_body_optionality_async.py → ...test_parameters_body_optionality_async.py
diff --git a/...est_parameters_collection_format_async.py → ...est_parameters_collection_format_async.py b/...est_parameters_collection_format_async.py → ...est_parameters_collection_format_async.py
diff --git a/...synctests/test_parameters_spread_async.py → ...synctests/test_parameters_spread_async.py b/...synctests/test_parameters_spread_async.py → ...synctests/test_parameters_spread_async.py
diff --git a/...test_payload_content_negotiation_async.py → ...test_payload_content_negotiation_async.py b/...test_payload_content_negotiation_async.py → ...test_payload_content_negotiation_async.py
diff --git a/...ts/test_payload_json_merge_patch_async.py → ...ts/test_payload_json_merge_patch_async.py b/...ts/test_payload_json_merge_patch_async.py → ...ts/test_payload_json_merge_patch_async.py
diff --git a/...ynctests/test_payload_media_type_async.py → ...ynctests/test_payload_media_type_async.py b/...ynctests/test_payload_media_type_async.py → ...ynctests/test_payload_media_type_async.py
diff --git a/...synctests/test_payload_multipart_async.py → ...synctests/test_payload_multipart_async.py b/...synctests/test_payload_multipart_async.py → ...synctests/test_payload_multipart_async.py
diff --git a/...asynctests/test_payload_pageable_async.py → ...asynctests/test_payload_pageable_async.py b/...asynctests/test_payload_pageable_async.py → ...asynctests/test_payload_pageable_async.py
diff --git a/...ests/asynctests/test_payload_xml_async.py → ...ests/asynctests/test_payload_xml_async.py b/...ests/asynctests/test_payload_xml_async.py → ...ests/asynctests/test_payload_xml_async.py
diff --git a/...tests/test_resiliency_srv_driven_async.py → ...tests/test_resiliency_srv_driven_async.py b/...tests/test_resiliency_srv_driven_async.py → ...tests/test_resiliency_srv_driven_async.py
diff --git a/...api_tests/asynctests/test_routes_async.py → ...api_tests/asynctests/test_routes_async.py b/...api_tests/asynctests/test_routes_async.py → ...api_tests/asynctests/test_routes_async.py
diff --git a/..._serialization_encoded_name_json_async.py → ..._serialization_encoded_name_json_async.py b/..._serialization_encoded_name_json_async.py → ..._serialization_encoded_name_json_async.py
diff --git a/...test_server_endpoint_not_defined_async.py → ...test_server_endpoint_not_defined_async.py b/...test_server_endpoint_not_defined_async.py → ...test_server_endpoint_not_defined_async.py
diff --git a/...ctests/test_server_path_multiple_async.py → ...ctests/test_server_path_multiple_async.py b/...ctests/test_server_path_multiple_async.py → ...ctests/test_server_path_multiple_async.py
diff --git a/...ynctests/test_server_path_single_async.py → ...ynctests/test_server_path_single_async.py b/...ynctests/test_server_path_single_async.py → ...ynctests/test_server_path_single_async.py
diff --git a/...st_server_versions_not_versioned_async.py → ...st_server_versions_not_versioned_async.py b/...st_server_versions_not_versioned_async.py → ...st_server_versions_not_versioned_async.py
diff --git a/...s/test_server_versions_versioned_async.py → ...s/test_server_versions_versioned_async.py b/...s/test_server_versions_versioned_async.py → ...s/test_server_versions_versioned_async.py
diff --git a/...cial_headers_conditional_request_async.py → ...cial_headers_conditional_request_async.py b/...cial_headers_conditional_request_async.py → ...cial_headers_conditional_request_async.py
diff --git a/...st_special_headers_repeatability_async.py → ...st_special_headers_repeatability_async.py b/...st_special_headers_repeatability_async.py → ...st_special_headers_repeatability_async.py
diff --git a/...ts/asynctests/test_special_words_async.py → ...ts/asynctests/test_special_words_async.py b/...ts/asynctests/test_special_words_async.py → ...ts/asynctests/test_special_words_async.py
diff --git a/...s/asynctests/test_typetest_array_async.py → ...s/asynctests/test_typetest_array_async.py b/...s/asynctests/test_typetest_array_async.py → ...s/asynctests/test_typetest_array_async.py
diff --git a/...nctests/test_typetest_dictionary_async.py → ...nctests/test_typetest_dictionary_async.py b/...nctests/test_typetest_dictionary_async.py → ...nctests/test_typetest_dictionary_async.py
diff --git a/...ts/test_typetest_enum_extensible_async.py → ...ts/test_typetest_enum_extensible_async.py b/...ts/test_typetest_enum_extensible_async.py → ...ts/test_typetest_enum_extensible_async.py
diff --git a/...nctests/test_typetest_enum_fixed_async.py → ...nctests/test_typetest_enum_fixed_async.py b/...nctests/test_typetest_enum_fixed_async.py → ...nctests/test_typetest_enum_fixed_async.py
diff --git a/...ctests/test_typetest_model_empty_async.py → ...ctests/test_typetest_model_empty_async.py b/...ctests/test_typetest_model_empty_async.py → ...ctests/test_typetest_model_empty_async.py
diff --git a/...l_inheritance_enum_discriminator_async.py → ...l_inheritance_enum_discriminator_async.py b/...l_inheritance_enum_discriminator_async.py → ...l_inheritance_enum_discriminator_async.py
diff --git a/...inheritance_nested_discriminator_async.py → ...inheritance_nested_discriminator_async.py b/...inheritance_nested_discriminator_async.py → ...inheritance_nested_discriminator_async.py
diff --git a/...el_inheritance_not_discriminated_async.py → ...el_inheritance_not_discriminated_async.py b/...el_inheritance_not_discriminated_async.py → ...el_inheritance_not_discriminated_async.py
diff --git a/...test_model_inheritance_recursive_async.py → ...test_model_inheritance_recursive_async.py b/...test_model_inheritance_recursive_async.py → ...test_model_inheritance_recursive_async.py
diff --git a/...inheritance_single_discriminator_async.py → ...inheritance_single_discriminator_async.py b/...inheritance_single_discriminator_async.py → ...inheritance_single_discriminator_async.py
diff --git a/...ctests/test_typetest_model_usage_async.py → ...ctests/test_typetest_model_usage_async.py b/...ctests/test_typetest_model_usage_async.py → ...ctests/test_typetest_model_usage_async.py
diff --git a/...s/test_typetest_model_visibility_async.py → ...s/test_typetest_model_visibility_async.py b/...s/test_typetest_model_visibility_async.py → ...s/test_typetest_model_visibility_async.py
diff --git a/...st_property_additionalproperties_async.py → ...st_property_additionalproperties_async.py b/...st_property_additionalproperties_async.py → ...st_property_additionalproperties_async.py
diff --git a/.../test_typetest_property_nullable_async.py → .../test_typetest_property_nullable_async.py b/.../test_typetest_property_nullable_async.py → .../test_typetest_property_nullable_async.py
diff --git a/.../test_typetest_property_optional_async.py → .../test_typetest_property_optional_async.py b/.../test_typetest_property_optional_async.py → .../test_typetest_property_optional_async.py
diff --git a/...est_typetest_property_valuetypes_async.py → ...est_typetest_property_valuetypes_async.py b/...est_typetest_property_valuetypes_async.py → ...est_typetest_property_valuetypes_async.py
diff --git a/.../asynctests/test_typetest_scalar_async.py → .../asynctests/test_typetest_scalar_async.py b/.../asynctests/test_typetest_scalar_async.py → .../asynctests/test_typetest_scalar_async.py
diff --git a/...s/asynctests/test_typetest_union_async.py → ...s/asynctests/test_typetest_union_async.py b/...s/asynctests/test_typetest_union_async.py → ...s/asynctests/test_typetest_union_async.py
diff --git a/...asynctests/test_versioning_added_async.py → ...asynctests/test_versioning_added_async.py b/...asynctests/test_versioning_added_async.py → ...asynctests/test_versioning_added_async.py
diff --git a/...ts/test_versioning_made_optional_async.py → ...ts/test_versioning_made_optional_async.py b/...ts/test_versioning_made_optional_async.py → ...ts/test_versioning_made_optional_async.py
diff --git a/...ynctests/test_versioning_removed_async.py → ...ynctests/test_versioning_removed_async.py b/...ynctests/test_versioning_removed_async.py → ...ynctests/test_versioning_removed_async.py
diff --git a/...sts/test_versioning_renamed_from_async.py → ...sts/test_versioning_renamed_from_async.py b/...sts/test_versioning_renamed_from_async.py → ...sts/test_versioning_renamed_from_async.py
diff --git a/...sioning_return_type_changed_from_async.py → ...sioning_return_type_changed_from_async.py b/...sioning_return_type_changed_from_async.py → ...sioning_return_type_changed_from_async.py
diff --git a/...est_versioning_type_changed_from_async.py → ...est_versioning_type_changed_from_async.py b/...est_versioning_type_changed_from_async.py → ...est_versioning_type_changed_from_async.py
diff --git a/...n/test/generic_mock_api_tests/conftest.py → ...r/test/generic_mock_api_tests/conftest.py b/...n/test/generic_mock_api_tests/conftest.py → ...r/test/generic_mock_api_tests/conftest.py
@@ -15,7 +15,7 @@
 
 
 def start_server_process():
-    path = Path(os.path.dirname(__file__)) / Path("../../node_modules/@azure-tools/cadl-ranch-specs")
+    path = Path(os.path.dirname(__file__)) / Path("../../../node_modules/@azure-tools/cadl-ranch-specs")
     os.chdir(path.resolve())
     cmd = "cadl-ranch serve ./http"
     if os.name == "nt":

diff --git a/...est/generic_mock_api_tests/data/image.jpg → ...est/generic_mock_api_tests/data/image.jpg b/...est/generic_mock_api_tests/data/image.jpg → ...est/generic_mock_api_tests/data/image.jpg
diff --git a/...est/generic_mock_api_tests/data/image.png → ...est/generic_mock_api_tests/data/image.png b/...est/generic_mock_api_tests/data/image.png → ...est/generic_mock_api_tests/data/image.png
diff --git a/...ric_mock_api_tests/test_authentication.py → ...ric_mock_api_tests/test_authentication.py b/...ric_mock_api_tests/test_authentication.py → ...ric_mock_api_tests/test_authentication.py
diff --git a/...eric_mock_api_tests/test_client_naming.py → ...eric_mock_api_tests/test_client_naming.py b/...eric_mock_api_tests/test_client_naming.py → ...eric_mock_api_tests/test_client_naming.py
diff --git a/...c_mock_api_tests/test_client_structure.py → ...c_mock_api_tests/test_client_structure.py b/...c_mock_api_tests/test_client_structure.py → ...c_mock_api_tests/test_client_structure.py
diff --git a/...neric_mock_api_tests/test_encode_bytes.py → ...neric_mock_api_tests/test_encode_bytes.py b/...neric_mock_api_tests/test_encode_bytes.py → ...neric_mock_api_tests/test_encode_bytes.py
diff --git a/...ic_mock_api_tests/test_encode_datetime.py → ...ic_mock_api_tests/test_encode_datetime.py b/...ic_mock_api_tests/test_encode_datetime.py → ...ic_mock_api_tests/test_encode_datetime.py
diff --git a/...ic_mock_api_tests/test_encode_duration.py → ...ic_mock_api_tests/test_encode_duration.py b/...ic_mock_api_tests/test_encode_duration.py → ...ic_mock_api_tests/test_encode_duration.py
diff --git a/...ric_mock_api_tests/test_encode_numeric.py → ...ric_mock_api_tests/test_encode_numeric.py b/...ric_mock_api_tests/test_encode_numeric.py → ...ric_mock_api_tests/test_encode_numeric.py
diff --git a/...eric_mock_api_tests/test_headasboolean.py → ...eric_mock_api_tests/test_headasboolean.py b/...eric_mock_api_tests/test_headasboolean.py → ...eric_mock_api_tests/test_headasboolean.py
diff --git a/...c_mock_api_tests/test_parameters_basic.py → ...c_mock_api_tests/test_parameters_basic.py b/...c_mock_api_tests/test_parameters_basic.py → ...c_mock_api_tests/test_parameters_basic.py
diff --git a/...tests/test_parameters_body_optionality.py → ...tests/test_parameters_body_optionality.py b/...tests/test_parameters_body_optionality.py → ...tests/test_parameters_body_optionality.py
diff --git a/...ests/test_parameters_collection_format.py → ...ests/test_parameters_collection_format.py b/...ests/test_parameters_collection_format.py → ...ests/test_parameters_collection_format.py
diff --git a/..._mock_api_tests/test_parameters_spread.py → ..._mock_api_tests/test_parameters_spread.py b/..._mock_api_tests/test_parameters_spread.py → ..._mock_api_tests/test_parameters_spread.py
diff --git a/...tests/test_payload_content_negotiation.py → ...tests/test_payload_content_negotiation.py b/...tests/test_payload_content_negotiation.py → ...tests/test_payload_content_negotiation.py
diff --git a/...pi_tests/test_payload_json_merge_patch.py → ...pi_tests/test_payload_json_merge_patch.py b/...pi_tests/test_payload_json_merge_patch.py → ...pi_tests/test_payload_json_merge_patch.py
diff --git a/...mock_api_tests/test_payload_media_type.py → ...mock_api_tests/test_payload_media_type.py b/...mock_api_tests/test_payload_media_type.py → ...mock_api_tests/test_payload_media_type.py
diff --git a/..._mock_api_tests/test_payload_multipart.py → ..._mock_api_tests/test_payload_multipart.py b/..._mock_api_tests/test_payload_multipart.py → ..._mock_api_tests/test_payload_multipart.py
diff --git a/...c_mock_api_tests/test_payload_pageable.py → ...c_mock_api_tests/test_payload_pageable.py b/...c_mock_api_tests/test_payload_pageable.py → ...c_mock_api_tests/test_payload_pageable.py
diff --git a/...eneric_mock_api_tests/test_payload_xml.py → ...eneric_mock_api_tests/test_payload_xml.py b/...eneric_mock_api_tests/test_payload_xml.py → ...eneric_mock_api_tests/test_payload_xml.py
diff --git a/...k_api_tests/test_resiliency_srv_driven.py → ...k_api_tests/test_resiliency_srv_driven.py b/...k_api_tests/test_resiliency_srv_driven.py → ...k_api_tests/test_resiliency_srv_driven.py
diff --git a/...est/generic_mock_api_tests/test_routes.py → ...est/generic_mock_api_tests/test_routes.py b/...est/generic_mock_api_tests/test_routes.py → ...est/generic_mock_api_tests/test_routes.py
diff --git a/...s/test_serialization_encoded_name_json.py → ...s/test_serialization_encoded_name_json.py b/...s/test_serialization_encoded_name_json.py → ...s/test_serialization_encoded_name_json.py
diff --git a/...tests/test_server_endpoint_not_defined.py → ...tests/test_server_endpoint_not_defined.py b/...tests/test_server_endpoint_not_defined.py → ...tests/test_server_endpoint_not_defined.py
diff --git a/...ck_api_tests/test_server_path_multiple.py → ...ck_api_tests/test_server_path_multiple.py b/...ck_api_tests/test_server_path_multiple.py → ...ck_api_tests/test_server_path_multiple.py
diff --git a/...mock_api_tests/test_server_path_single.py → ...mock_api_tests/test_server_path_single.py b/...mock_api_tests/test_server_path_single.py → ...mock_api_tests/test_server_path_single.py
diff --git a/...sts/test_server_versions_not_versioned.py → ...sts/test_server_versions_not_versioned.py b/...sts/test_server_versions_not_versioned.py → ...sts/test_server_versions_not_versioned.py
diff --git a/...i_tests/test_server_versions_versioned.py → ...i_tests/test_server_versions_versioned.py b/...i_tests/test_server_versions_versioned.py → ...i_tests/test_server_versions_versioned.py
diff --git a/...st_special_headers_conditional_request.py → ...st_special_headers_conditional_request.py b/...st_special_headers_conditional_request.py → ...st_special_headers_conditional_request.py
diff --git a/...sts/test_special_headers_repeatability.py → ...sts/test_special_headers_repeatability.py b/...sts/test_special_headers_repeatability.py → ...sts/test_special_headers_repeatability.py
diff --git a/...eric_mock_api_tests/test_special_words.py → ...eric_mock_api_tests/test_special_words.py b/...eric_mock_api_tests/test_special_words.py → ...eric_mock_api_tests/test_special_words.py
diff --git a/...ric_mock_api_tests/test_typetest_array.py → ...ric_mock_api_tests/test_typetest_array.py b/...ric_mock_api_tests/test_typetest_array.py → ...ric_mock_api_tests/test_typetest_array.py
diff --git a/...ock_api_tests/test_typetest_dictionary.py → ...ock_api_tests/test_typetest_dictionary.py b/...ock_api_tests/test_typetest_dictionary.py → ...ock_api_tests/test_typetest_dictionary.py
diff --git a/...pi_tests/test_typetest_enum_extensible.py → ...pi_tests/test_typetest_enum_extensible.py b/...pi_tests/test_typetest_enum_extensible.py → ...pi_tests/test_typetest_enum_extensible.py
diff --git a/...ock_api_tests/test_typetest_enum_fixed.py → ...ock_api_tests/test_typetest_enum_fixed.py b/...ock_api_tests/test_typetest_enum_fixed.py → ...ock_api_tests/test_typetest_enum_fixed.py
diff --git a/...ck_api_tests/test_typetest_model_empty.py → ...ck_api_tests/test_typetest_model_empty.py b/...ck_api_tests/test_typetest_model_empty.py → ...ck_api_tests/test_typetest_model_empty.py
diff --git a/...t_model_inheritance_enum_discriminator.py → ...t_model_inheritance_enum_discriminator.py b/...t_model_inheritance_enum_discriminator.py → ...t_model_inheritance_enum_discriminator.py
diff --git a/...model_inheritance_nested_discriminator.py → ...model_inheritance_nested_discriminator.py b/...model_inheritance_nested_discriminator.py → ...model_inheritance_nested_discriminator.py
diff --git a/...st_model_inheritance_not_discriminated.py → ...st_model_inheritance_not_discriminated.py b/...st_model_inheritance_not_discriminated.py → ...st_model_inheritance_not_discriminated.py
diff --git a/...t_typetest_model_inheritance_recursive.py → ...t_typetest_model_inheritance_recursive.py b/...t_typetest_model_inheritance_recursive.py → ...t_typetest_model_inheritance_recursive.py
diff --git a/...model_inheritance_single_discriminator.py → ...model_inheritance_single_discriminator.py b/...model_inheritance_single_discriminator.py → ...model_inheritance_single_discriminator.py
diff --git a/...ck_api_tests/test_typetest_model_usage.py → ...ck_api_tests/test_typetest_model_usage.py b/...ck_api_tests/test_typetest_model_usage.py → ...ck_api_tests/test_typetest_model_usage.py
diff --git a/...i_tests/test_typetest_model_visibility.py → ...i_tests/test_typetest_model_visibility.py b/...i_tests/test_typetest_model_visibility.py → ...i_tests/test_typetest_model_visibility.py
diff --git a/...typetest_property_additionalproperties.py → ...typetest_property_additionalproperties.py b/...typetest_property_additionalproperties.py → ...typetest_property_additionalproperties.py
diff --git a/..._tests/test_typetest_property_nullable.py → ..._tests/test_typetest_property_nullable.py b/..._tests/test_typetest_property_nullable.py → ..._tests/test_typetest_property_nullable.py
diff --git a/..._tests/test_typetest_property_optional.py → ..._tests/test_typetest_property_optional.py b/..._tests/test_typetest_property_optional.py → ..._tests/test_typetest_property_optional.py
diff --git a/...ests/test_typetest_property_valuetypes.py → ...ests/test_typetest_property_valuetypes.py b/...ests/test_typetest_property_valuetypes.py → ...ests/test_typetest_property_valuetypes.py
diff --git a/...ic_mock_api_tests/test_typetest_scalar.py → ...ic_mock_api_tests/test_typetest_scalar.py b/...ic_mock_api_tests/test_typetest_scalar.py → ...ic_mock_api_tests/test_typetest_scalar.py
diff --git a/...ric_mock_api_tests/test_typetest_union.py → ...ric_mock_api_tests/test_typetest_union.py b/...ric_mock_api_tests/test_typetest_union.py → ...ric_mock_api_tests/test_typetest_union.py
diff --git a/...c_mock_api_tests/test_versioning_added.py → ...c_mock_api_tests/test_versioning_added.py b/...c_mock_api_tests/test_versioning_added.py → ...c_mock_api_tests/test_versioning_added.py
diff --git a/...pi_tests/test_versioning_made_optional.py → ...pi_tests/test_versioning_made_optional.py b/...pi_tests/test_versioning_made_optional.py → ...pi_tests/test_versioning_made_optional.py
diff --git a/...mock_api_tests/test_versioning_removed.py → ...mock_api_tests/test_versioning_removed.py b/...mock_api_tests/test_versioning_removed.py → ...mock_api_tests/test_versioning_removed.py
diff --git a/...api_tests/test_versioning_renamed_from.py → ...api_tests/test_versioning_renamed_from.py b/...api_tests/test_versioning_renamed_from.py → ...api_tests/test_versioning_renamed_from.py
diff --git a/...st_versioning_return_type_changed_from.py → ...st_versioning_return_type_changed_from.py b/...st_versioning_return_type_changed_from.py → ...st_versioning_return_type_changed_from.py
diff --git a/...ests/test_versioning_type_changed_from.py → ...ests/test_versioning_type_changed_from.py b/...ests/test_versioning_type_changed_from.py → ...ests/test_versioning_type_changed_from.py
diff --git a/...nittests/test_model_base_serialization.py → ...nittests/test_model_base_serialization.py b/...nittests/test_model_base_serialization.py → ...nittests/test_model_base_serialization.py
diff --git a/...ests/test_model_base_xml_serialization.py → ...ests/test_model_base_xml_serialization.py b/...ests/test_model_base_xml_serialization.py → ...ests/test_model_base_xml_serialization.py
diff --git a/..._tests/asynctests/test_unbranded_async.py → ..._tests/asynctests/test_unbranded_async.py b/..._tests/asynctests/test_unbranded_async.py → ..._tests/asynctests/test_unbranded_async.py
diff --git a/...ded/mock_api_tests/cadl-ranch-config.yaml → ...ded/mock_api_tests/cadl-ranch-config.yaml b/...ded/mock_api_tests/cadl-ranch-config.yaml → ...ded/mock_api_tests/cadl-ranch-config.yaml
diff --git a/...test/unbranded/mock_api_tests/conftest.py → ...test/unbranded/mock_api_tests/conftest.py b/...test/unbranded/mock_api_tests/conftest.py → ...test/unbranded/mock_api_tests/conftest.py
@@ -12,7 +12,7 @@
 
 
 def start_server_process():
-    path = Path(os.path.dirname(__file__)) / Path("../../../node_modules/@azure-tools/cadl-ranch-specs")
+    path = Path(os.path.dirname(__file__)) / Path("../../../../node_modules/@azure-tools/cadl-ranch-specs")
     os.chdir(path.resolve())
     cmd = "cadl-ranch serve ./http"
     if os.name == "nt":

diff --git a/...nbranded/mock_api_tests/test_unbranded.py → ...nbranded/mock_api_tests/test_unbranded.py b/...nbranded/mock_api_tests/test_unbranded.py → ...nbranded/mock_api_tests/test_unbranded.py
diff --git a/...nt-python/test/unbranded/requirements.txt → ...generator/test/unbranded/requirements.txt b/...nt-python/test/unbranded/requirements.txt → ...generator/test/unbranded/requirements.txt
@@ -2,12 +2,12 @@ aiohttp;python_full_version>="3.5.2"
 requests==2.32.2
 pytest
 pytest-asyncio==0.14.0;python_full_version>="3.5.2"
-corehttp==1.0.0b3
 pyright==1.1.379
 pylint==3.2.7
 tox==4.18.1
 mypy==1.10.1
 
+
 # common test case
 -e ./generated/authentication-api-key
 -e ./generated/authentication-http-custom
@@ -63,6 +63,7 @@ mypy==1.10.1
 -e ./generated/payload-multipart
 -e ./generated/payload-media-type
 -e ./generated/payload-xml
+-e ./generated/routes
 -e ./generated/versioning-added
 -e ./generated/versioning-madeoptional
 -e ./generated/versioning-removed

diff --git a/packages/http-client-python/generator/test/unbranded/tox.ini b/packages/http-client-python/generator/test/unbranded/tox.ini
@@ -0,0 +1,56 @@
+[tox]
+envlist=base, lint, mypy, pyright, apiview
+skipsdist=True
+
+[testenv:ci]
+deps=
+    -r requirements.txt
+commands =
+    # pytest
+    pytest mock_api_tests ../generic_mock_api_tests
+
+    # pylint
+    pip install azure-pylint-guidelines-checker==0.4.1 --index-url="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-python/pypi/simple/"
+    python ../../../eng/scripts/ci/run_pylint.py -t unbranded -s "generated" {posargs}
+
+    # mypy
+    python ../../../eng/scripts/ci/run_mypy.py -t unbranded -s "generated" {posargs}
+
+    # pyright
+    python ../../../eng/scripts/ci/run_pyright.py -t unbranded -s "generated" {posargs}
+
+    # apiview
+    ; pip install apiview-stub-generator==0.3.12 --index-url="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-python/pypi/simple/"
+    ; python ../../../eng/scripts/ci/run_apiview.py -t unbranded -s "generated" {posargs}
+
+[testenv:test]
+deps=
+    -r requirements.txt
+commands =
+    pytest mock_api_tests ../generic_mock_api_tests
+
+[testenv:lint]
+deps=
+    -r requirements.txt
+commands =
+    pip install azure-pylint-guidelines-checker==0.4.1 --index-url="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-python/pypi/simple/"
+    python ../../../eng/scripts/ci/run_pylint.py -t unbranded -s "generated" {posargs}
+
+[testenv:mypy]
+deps=
+    -r requirements.txt
+commands =
+    python ../../../eng/scripts/ci/run_mypy.py -t unbranded -s "generated" {posargs}
+
+[testenv:pyright]
+deps=
+    -r requirements.txt
+commands =
+    python ../../../eng/scripts/ci/run_pyright.py -t unbranded -s "generated" {posargs}
+
+[testenv:apiview]
+deps=
+    -r requirements.txt
+commands =
+    pip install apiview-stub-generator==0.3.12 --index-url="https://pkgs.dev.azure.com/azure-sdk/public/_packaging/azure-sdk-for-python/pypi/simple/"
+    python ../../../eng/scripts/ci/run_apiview.py -t unbranded -s "generated" {posargs}
diff --git a/packages/http-client-python/package.json b/packages/http-client-python/package.json
@@ -33,7 +33,7 @@
     "node": ">=18.0.0"
   },
   "scripts": {
-    "clean": "rimraf ./dist ./temp ./test/**/generated/ ./venv",
+    "clean": "rimraf ./dist ./temp ./**/test/**/generated/ ./venv",
     "build": "tsc -p ./emitter/tsconfig.build.json",
     "watch": "tsc -p ./emitter/tsconfig.build.json --watch",
     "lint": "eslint . --max-warnings=0",
@@ -42,8 +42,10 @@
     "install": "tsx ./eng/scripts/setup/run-python3.ts ./eng/scripts/setup/install.py",
     "prepare": "tsx ./eng/scripts/setup/run-python3.ts ./eng/scripts/setup/prepare.py",
     "regenerate": "tsx ./eng/scripts/ci/regenerate.ts",
-    "ci": "tsx ./eng/scripts/ci/run-tests.ts",
-    "test": "tsx ./eng/scripts/ci/run-tests.ts --command=test"
+    "ci": "npm run test:emitter && npm run ci:generator --",
+    "ci:generator": "tsx ./eng/scripts/ci/run-ci.ts",
+    "test:generator": "tsx ./eng/scripts/ci/run-ci.ts --command=test",
+    "test:emitter": "vitest run -c ./emitter/vitest.config.ts"
   },
   "files": [
     "dist/**",

diff --git a/packages/http-client-python/test/azure/tox.ini b/packages/http-client-python/test/azure/tox.ini