@typespec/http-client-python 0.4.4 → 0.5.1

package/generator/build/lib/pygen/preprocess/python_mappings.py

@@ -0,0 +1,226 @@
+# -------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+# --------------------------------------------------------------------------
+from enum import Enum
+
+basic_latin_chars = {
+    " ": "Space",
+    "!": "ExclamationMark",
+    '"': "QuotationMark",
+    "#": "NumberSign",
+    "$": "DollarSign",
+    "%": "PercentSign",
+    "&": "Ampersand",
+    "'": "Apostrophe",
+    "(": "LeftParenthesis",
+    ")": "RightParenthesis",
+    "*": "Asterisk",
+    "+": "PlusSign",
+    ",": "Comma",
+    "-": "HyphenMinus",
+    ".": "FullStop",
+    "/": "Slash",
+    "0": "Zero",
+    "1": "One",
+    "2": "Two",
+    "3": "Three",
+    "4": "Four",
+    "5": "Five",
+    "6": "Six",
+    "7": "Seven",
+    "8": "Eight",
+    "9": "Nine",
+    ":": "Colon",
+    ";": "Semicolon",
+    "<": "LessThanSign",
+    "=": "EqualSign",
+    ">": "GreaterThanSign",
+    "?": "QuestionMark",
+    "@": "AtSign",
+    "[": "LeftSquareBracket",
+    "\\": "Backslash",
+    "]": "RightSquareBracket",
+    "^": "CircumflexAccent",
+    "`": "GraveAccent",
+    "{": "LeftCurlyBracket",
+    "|": "VerticalBar",
+    "}": "RightCurlyBracket",
+    "~": "Tilde",
+}
+
+
+class PadType(str, Enum):
+    MODEL = "Model"
+    ENUM_CLASS = "Enum"
+    METHOD = "_method"
+    PARAMETER = "_parameter"
+    ENUM_VALUE = "_enum"
+    PROPERTY = "_property"
+    OPERATION_GROUP = "Operations"
+
+
+_always_reserved = [
+    "and",
+    "as",
+    "assert",
+    "break",
+    "class",
+    "continue",
+    "def",
+    "del",
+    "elif",
+    "else",
+    "except",
+    "exec",
+    "finally",
+    "for",
+    "from",
+    "global",
+    "if",
+    "import",
+    "in",
+    "is",
+    "lambda",
+    "not",
+    "or",
+    "pass",
+    "raise",
+    "return",
+    "try",
+    "while",
+    "with",
+    "yield",
+    "async",
+    "await",
+    "int",
+]
+
+RESERVED_MODEL_PROPERTIES = [
+    "keys",
+    "items",
+    "values",
+    "popitem",
+    "clear",
+    "update",
+    "setdefault",
+    "pop",
+    "get",
+    "copy",
+    "as_dict",
+]
+
+RESERVED_WORDS = {
+    PadType.METHOD: [*_always_reserved],
+    PadType.PARAMETER: [
+        "self",
+        # these are kwargs we've reserved for our generated operations
+        "content_type",
+        "accept",
+        "cls",
+        "polling",
+        "continuation_token",  # for LRO calls
+        # these are transport kwargs
+        # https://github.com/Azure/azure-sdk-for-python/blob/master/sdk/core/azure-core/CLIENT_LIBRARY_DEVELOPER.md#transport
+        "connection_timeout",
+        "connection_verify",
+        "connection_cert",
+        "connection_data_block_size",
+        "use_env_settings",
+        # the following aren't in the readme, but @xiangyan99 said these are also transport kwargs
+        "read_timeout",
+        "proxies",
+        "cookies",
+        # these are policy kwargs
+        # https://github.com/Azure/azure-sdk-for-python/blob/master/sdk/core/azure-core/CLIENT_LIBRARY_DEVELOPER.md#available-policies
+        "base_headers",
+        "headers",
+        "request_id",
+        "auto_request_id",
+        "base_user_agent",
+        "user_agent",
+        "user_agent_overwrite",
+        "user_agent_use_env",
+        "user_agent",
+        "sdk_moniker",
+        "logging_enable",
+        "logger",
+        "response_encoding",
+        "proxies",
+        "raw_request_hook",
+        "raw_response_hook",
+        "network_span_namer",
+        "tracing_attributes",
+        "permit_redirects",
+        "redirect_max",
+        "redirect_remove_headers",
+        "redirect_on_status_codes",
+        "permit_redirects",
+        "redirect_max",
+        "redirect_remove_headers",
+        "redirect_on_status_codes",
+        "retry_total",
+        "retry_connect",
+        "retry_read",
+        "retry_status",
+        "retry_backoff_factor",
+        "retry_backoff_max",
+        "retry_mode",
+        "retry_on_status_codes",
+        "retry_total",
+        "retry_connect",
+        "retry_read",
+        "retry_status",
+        "retry_backoff_factor",
+        "retry_backoff_max",
+        "retry_mode",
+        "retry_on_status_codes",
+        *_always_reserved,
+    ],
+    PadType.MODEL: ["enum", *_always_reserved],
+    PadType.PROPERTY: ["self", *_always_reserved],
+    PadType.ENUM_CLASS: ["enum", *_always_reserved],
+    PadType.ENUM_VALUE: ["mro", *_always_reserved],
+    PadType.OPERATION_GROUP: [*_always_reserved],
+}
+
+CADL_RESERVED_WORDS = {
+    PadType.PARAMETER: ["stream"],
+    PadType.PROPERTY: RESERVED_MODEL_PROPERTIES,
+}
+
+REDEFINED_BUILTINS = [  # we don't pad, but we need to do lint ignores
+    "id",
+    "min",
+    "max",
+    "filter",
+    "property",
+]
+
+BUILTIN_PACKAGES = [
+    "array",
+    "atexit",
+    "binascii",
+    "builtins",
+    "cmath",
+    "errno",
+    "faulthandler",
+    "fcntl",
+    "gc",
+    "grp",
+    "itertools",
+    "marshal",
+    "math",
+    "posix",
+    "pwd",
+    "pyexpat",
+    "select",
+    "spwd",
+    "sys",
+    "syslog",
+    "time",
+    "unicodedata",
+    "xxsubtype",
+    "zlib",
+]

package/generator/build/lib/pygen/utils.py

@@ -0,0 +1,163 @@
+# -------------------------------------------------------------------------
+# Copyright (c) Microsoft Corporation. All rights reserved.
+# Licensed under the MIT License. See License.txt in the project root for
+# license information.
+# --------------------------------------------------------------------------
+from typing import Any, Dict, Tuple, List
+import re
+import argparse
+
+
+def update_enum_value(name: str, value: Any, description: str, enum_type: Dict[str, Any]) -> Dict[str, Any]:
+    return {
+        "name": name,
+        "type": "enumvalue",
+        "value": value,
+        "description": description,
+        "enumType": enum_type,
+        "valueType": enum_type["valueType"],
+    }
+
+
+def to_snake_case(name: str) -> str:
+    def replace_upper_characters(m) -> str:
+        match_str = m.group().lower()
+        if m.start() > 0 and name[m.start() - 1] == "_":
+            # we are good if a '_' already exists
+            return match_str
+        # the first letter should not have _
+        prefix = "_" if m.start() > 0 else ""
+
+        # we will add an extra _ if there are multiple upper case chars together
+        next_non_upper_case_char_location = m.start() + len(match_str)
+        if (
+            len(match_str) > 2
+            and len(name) - next_non_upper_case_char_location > 1
+            and name[next_non_upper_case_char_location].isalpha()
+        ):
+            return prefix + match_str[: len(match_str) - 1] + "_" + match_str[len(match_str) - 1]
+
+        return prefix + match_str
+
+    result = re.sub("[A-Z]+", replace_upper_characters, name)
+    return result.replace(" ", "_").replace("__", "_").replace("-", "")
+
+
+def parse_args(
+    need_cadl_file: bool = True,
+) -> Tuple[argparse.Namespace, Dict[str, Any]]:
+    parser = argparse.ArgumentParser(
+        description="Run mypy against target folder. Add a local custom plugin to the path prior to execution. "
+    )
+    parser.add_argument(
+        "--output-folder",
+        dest="output_folder",
+        help="Output folder for generated SDK",
+        required=True,
+    )
+    parser.add_argument(
+        "--cadl-file",
+        dest="cadl_file",
+        help="Serialized cadl file",
+        required=need_cadl_file,
+    )
+    parser.add_argument(
+        "--debug",
+        dest="debug",
+        help="Debug mode",
+        required=False,
+        action="store",
+    )
+    args, unknown_args = parser.parse_known_args()
+
+    def _get_value(value: Any) -> Any:
+        if value == "true":
+            return True
+        if value == "false":
+            return False
+        try:
+            return int(value)
+        except ValueError:
+            pass
+        return value
+
+    unknown_args_ret = {
+        ua.strip("--").split("=", maxsplit=1)[0]: _get_value(ua.strip("--").split("=", maxsplit=1)[1])
+        for ua in unknown_args
+    }
+    return args, unknown_args_ret
+
+
+def get_body_type_for_description(body_parameter: Dict[str, Any]) -> str:
+    if body_parameter["type"]["type"] == "binary":
+        return "binary"
+    if body_parameter["type"]["type"] == "string":
+        return "string"
+    return "JSON"
+
+
+# used if we want to get a string / binary type etc
+KNOWN_TYPES: Dict[str, Dict[str, Any]] = {
+    "string": {"type": "string"},
+    "binary": {"type": "binary"},
+    "anydict": {"type": "dict", "elementType": {"type": "any"}},
+    "any-object": {"type": "any-object"},
+}
+
+JSON_REGEXP = re.compile(r"^(application|text)/(.+\+)?json$")
+XML_REGEXP = re.compile(r"^(application|text)/(.+\+)?xml$")
+
+
+def build_policies(
+    is_arm: bool,
+    async_mode: bool,
+    *,
+    is_azure_flavor: bool = False,
+    tracing: bool = True,
+) -> List[str]:
+    if is_azure_flavor:
+        # for Azure
+        async_prefix = "Async" if async_mode else ""
+        policies = [
+            "policies.RequestIdPolicy(**kwargs)",
+            "self._config.headers_policy",
+            "self._config.user_agent_policy",
+            "self._config.proxy_policy",
+            "policies.ContentDecodePolicy(**kwargs)",
+            (f"{async_prefix}ARMAutoResourceProviderRegistrationPolicy()" if is_arm else None),
+            "self._config.redirect_policy",
+            "self._config.retry_policy",
+            "self._config.authentication_policy",
+            "self._config.custom_hook_policy",
+            "self._config.logging_policy",
+            "policies.DistributedTracingPolicy(**kwargs)" if tracing else None,
+            "policies.SensitiveHeaderCleanupPolicy(**kwargs) if self._config.redirect_policy else None",
+            "self._config.http_logging_policy",
+        ]
+    else:
+        # for non-Azure
+        policies = [
+            "self._config.headers_policy",
+            "self._config.user_agent_policy",
+            "self._config.proxy_policy",
+            "policies.ContentDecodePolicy(**kwargs)",
+            "self._config.retry_policy",
+            "self._config.authentication_policy",
+            "self._config.logging_policy",
+        ]
+    return [p for p in policies if p]
+
+
+def extract_original_name(name: str) -> str:
+    return name[1 : -len("_initial")]
+
+
+def json_serializable(content_type: str) -> bool:
+    return bool(JSON_REGEXP.match(content_type.split(";")[0].strip().lower()))
+
+
+def xml_serializable(content_type: str) -> bool:
+    return bool(XML_REGEXP.match(content_type.split(";")[0].strip().lower()))
+
+
+NAME_LENGTH_LIMIT = 40

package/generator/component-detection-pip-report.json

@@ -0,0 +1,134 @@
+{
+  "version": "1",
+  "pip_version": "24.3.1",
+  "install": [
+    {
+      "download_info": {
+        "url": "https://files.pythonhosted.org/packages/90/12/282ee9bce8b58130cb762fbc9beabd531549952cac11fc56add11dcb7ea0/setuptools-75.3.0-py3-none-any.whl",
+        "archive_info": {
+          "hash": "sha256=f2504966861356aa38616760c0f66568e535562374995367b4e69c7143cf6bcd",
+          "hashes": {
+            "sha256": "f2504966861356aa38616760c0f66568e535562374995367b4e69c7143cf6bcd"
+          }
+        }
+      },
+      "is_direct": false,
+      "is_yanked": false,
+      "requested": true,
+      "metadata": {
+        "metadata_version": "2.1",
+        "name": "setuptools",
+        "version": "75.3.0",
+        "summary": "Easily download, build, install, upgrade, and uninstall Python packages",
+        "description_content_type": "text/x-rst",
+        "keywords": [
+          "CPAN",
+          "PyPI",
+          "distutils",
+          "eggs",
+          "package",
+          "management"
+        ],
+        "author_email": "Python Packaging Authority <distutils-sig@python.org>",
+        "classifier": [
+          "Development Status :: 5 - Production/Stable",
+          "Intended Audience :: Developers",
+          "License :: OSI Approved :: MIT License",
+          "Programming Language :: Python :: 3",
+          "Programming Language :: Python :: 3 :: Only",
+          "Topic :: Software Development :: Libraries :: Python Modules",
+          "Topic :: System :: Archiving :: Packaging",
+          "Topic :: System :: Systems Administration",
+          "Topic :: Utilities"
+        ],
+        "requires_dist": [
+          "pytest-checkdocs >=2.4 ; extra == 'check'",
+          "pytest-ruff >=0.2.1 ; (sys_platform != \"cygwin\") and extra == 'check'",
+          "ruff >=0.5.2 ; (sys_platform != \"cygwin\") and extra == 'check'",
+          "packaging >=24 ; extra == 'core'",
+          "more-itertools >=8.8 ; extra == 'core'",
+          "jaraco.text >=3.7 ; extra == 'core'",
+          "wheel >=0.43.0 ; extra == 'core'",
+          "platformdirs >=4.2.2 ; extra == 'core'",
+          "jaraco.collections ; extra == 'core'",
+          "jaraco.functools ; extra == 'core'",
+          "packaging ; extra == 'core'",
+          "more-itertools ; extra == 'core'",
+          "importlib-metadata >=6 ; (python_version < \"3.10\") and extra == 'core'",
+          "tomli >=2.0.1 ; (python_version < \"3.11\") and extra == 'core'",
+          "importlib-resources >=5.10.2 ; (python_version < \"3.9\") and extra == 'core'",
+          "pytest-cov ; extra == 'cover'",
+          "sphinx >=3.5 ; extra == 'doc'",
+          "jaraco.packaging >=9.3 ; extra == 'doc'",
+          "rst.linker >=1.9 ; extra == 'doc'",
+          "furo ; extra == 'doc'",
+          "sphinx-lint ; extra == 'doc'",
+          "jaraco.tidelift >=1.4 ; extra == 'doc'",
+          "pygments-github-lexers ==0.0.5 ; extra == 'doc'",
+          "sphinx-favicon ; extra == 'doc'",
+          "sphinx-inline-tabs ; extra == 'doc'",
+          "sphinx-reredirects ; extra == 'doc'",
+          "sphinxcontrib-towncrier ; extra == 'doc'",
+          "sphinx-notfound-page <2,>=1 ; extra == 'doc'",
+          "pyproject-hooks !=1.1 ; extra == 'doc'",
+          "towncrier <24.7 ; extra == 'doc'",
+          "pytest-enabler >=2.2 ; extra == 'enabler'",
+          "pytest !=8.1.*,>=6 ; extra == 'test'",
+          "virtualenv >=13.0.0 ; extra == 'test'",
+          "wheel >=0.44.0 ; extra == 'test'",
+          "pip >=19.1 ; extra == 'test'",
+          "packaging >=23.2 ; extra == 'test'",
+          "jaraco.envs >=2.2 ; extra == 'test'",
+          "pytest-xdist >=3 ; extra == 'test'",
+          "jaraco.path >=3.2.0 ; extra == 'test'",
+          "build[virtualenv] >=1.0.3 ; extra == 'test'",
+          "filelock >=3.4.0 ; extra == 'test'",
+          "ini2toml[lite] >=0.14 ; extra == 'test'",
+          "tomli-w >=1.0.0 ; extra == 'test'",
+          "pytest-timeout ; extra == 'test'",
+          "pytest-home >=0.5 ; extra == 'test'",
+          "pytest-subprocess ; extra == 'test'",
+          "pyproject-hooks !=1.1 ; extra == 'test'",
+          "jaraco.test >=5.5 ; extra == 'test'",
+          "jaraco.develop >=7.21 ; (python_version >= \"3.9\" and sys_platform != \"cygwin\") and extra == 'test'",
+          "pytest-perf ; (sys_platform != \"cygwin\") and extra == 'test'",
+          "pytest-mypy ; extra == 'type'",
+          "mypy ==1.12.* ; extra == 'type'",
+          "importlib-metadata >=7.0.2 ; (python_version < \"3.10\") and extra == 'type'",
+          "jaraco.develop >=7.21 ; (sys_platform != \"cygwin\") and extra == 'type'"
+        ],
+        "requires_python": ">=3.8",
+        "project_url": [
+          "Source, https://github.com/pypa/setuptools",
+          "Documentation, https://setuptools.pypa.io/",
+          "Changelog, https://setuptools.pypa.io/en/stable/history.html"
+        ],
+        "provides_extra": [
+          "certs",
+          "check",
+          "core",
+          "cover",
+          "doc",
+          "enabler",
+          "ssl",
+          "test",
+          "type"
+        ],
+        "description": ".. |pypi-version| image:: https://img.shields.io/pypi/v/setuptools.svg\n   :target: https://pypi.org/project/setuptools\n\n.. |py-version| image:: https://img.shields.io/pypi/pyversions/setuptools.svg\n\n.. |test-badge| image:: https://github.com/pypa/setuptools/actions/workflows/main.yml/badge.svg\n   :target: https://github.com/pypa/setuptools/actions?query=workflow%3A%22tests%22\n   :alt: tests\n\n.. |ruff-badge| image:: https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/charliermarsh/ruff/main/assets/badge/v2.json\n   :target: https://github.com/astral-sh/ruff\n   :alt: Ruff\n\n.. |docs-badge| image:: https://img.shields.io/readthedocs/setuptools/latest.svg\n   :target: https://setuptools.pypa.io\n\n.. |skeleton-badge| image:: https://img.shields.io/badge/skeleton-2024-informational\n   :target: https://blog.jaraco.com/skeleton\n\n.. |codecov-badge| image:: https://img.shields.io/codecov/c/github/pypa/setuptools/master.svg?logo=codecov&logoColor=white\n   :target: https://codecov.io/gh/pypa/setuptools\n\n.. |tidelift-badge| image:: https://tidelift.com/badges/github/pypa/setuptools?style=flat\n   :target: https://tidelift.com/subscription/pkg/pypi-setuptools?utm_source=pypi-setuptools&utm_medium=readme\n\n.. |discord-badge| image:: https://img.shields.io/discord/803025117553754132\n   :target: https://discord.com/channels/803025117553754132/815945031150993468\n   :alt: Discord\n\n|pypi-version| |py-version| |test-badge| |ruff-badge| |docs-badge| |skeleton-badge| |codecov-badge| |discord-badge|\n\nSee the `Quickstart <https://setuptools.pypa.io/en/latest/userguide/quickstart.html>`_\nand the `User's Guide <https://setuptools.pypa.io/en/latest/userguide/>`_ for\ninstructions on how to use Setuptools.\n\nQuestions and comments should be directed to `GitHub Discussions\n<https://github.com/pypa/setuptools/discussions>`_.\nBug reports and especially tested patches may be\nsubmitted directly to the `bug tracker\n<https://github.com/pypa/setuptools/issues>`_.\n\n\nCode of Conduct\n===============\n\nEveryone interacting in the setuptools project's codebases, issue trackers,\nchat rooms, and fora is expected to follow the\n`PSF Code of Conduct <https://github.com/pypa/.github/blob/main/CODE_OF_CONDUCT.md>`_.\n\n\nFor Enterprise\n==============\n\nAvailable as part of the Tidelift Subscription.\n\nSetuptools and the maintainers of thousands of other packages are working with Tidelift to deliver one enterprise subscription that covers all of the open source you use.\n\n`Learn more <https://tidelift.com/subscription/pkg/pypi-setuptools?utm_source=pypi-setuptools&utm_medium=referral&utm_campaign=github>`_.\n"
+      }
+    }
+  ],
+  "environment": {
+    "implementation_name": "cpython",
+    "implementation_version": "3.8.10",
+    "os_name": "posix",
+    "platform_machine": "x86_64",
+    "platform_release": "5.15.0-1075-azure",
+    "platform_system": "Linux",
+    "platform_version": "#84~20.04.1-Ubuntu SMP Mon Nov 4 18:58:41 UTC 2024",
+    "python_full_version": "3.8.10",
+    "platform_python_implementation": "CPython",
+    "python_version": "3.8",
+    "sys_platform": "linux"
+  }
+}

package/generator/dev_requirements.txt

@@ -3,7 +3,6 @@ pyright==1.1.389
 pylint==3.2.7
 tox==4.16.0
 mypy==1.13.0
-azure-pylint-guidelines-checker==0.0.8
 colorama==0.4.6
 debugpy==1.8.2
 pytest==8.3.2

package/generator/pygen/codegen/__init__.py

@@ -244,8 +244,8 @@ class CodeGenerator(Plugin):
     @staticmethod
     def sort_exceptions(yaml_data: Dict[str, Any]) -> None:
         for client in yaml_data["clients"]:
-            for group in client["operationGroups"]:
-                for operation in group["operations"]:
+            for group in client.get("operationGroups", []):
+                for operation in group.get("operations", []):
                     if not operation.get("exceptions"):
                         continue
                     # sort exceptions by status code, first single status code, then range, then default
@@ -261,8 +261,8 @@ class CodeGenerator(Plugin):
     @staticmethod
     def remove_cloud_errors(yaml_data: Dict[str, Any]) -> None:
         for client in yaml_data["clients"]:
-            for group in client["operationGroups"]:
-                for operation in group["operations"]:
+            for group in client.get("operationGroups", []):
+                for operation in group.get("operations", []):
                     if not operation.get("exceptions"):
                         continue
                     i = 0

package/generator/pygen.egg-info/PKG-INFO

@@ -17,9 +17,12 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: License :: OSI Approved :: MIT License
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: Jinja2>=2.11
-Requires-Dist: pyyaml
-Requires-Dist: m2r2
-Requires-Dist: black
+Requires-Dist: black==24.8.0
+Requires-Dist: docutils>=0.20.1
+Requires-Dist: Jinja2==3.1.3
+Requires-Dist: m2r2==0.3.3.post2
+Requires-Dist: PyYAML==6.0.1
+Requires-Dist: tomli==2.0.1
+Requires-Dist: setuptools==69.5.1
 
 # Core Library for Python Generation

package/generator/pygen.egg-info/requires.txt

@@ -1,4 +1,7 @@
-Jinja2>=2.11
-pyyaml
-m2r2
-black
+black==24.8.0
+docutils>=0.20.1
+Jinja2==3.1.3
+m2r2==0.3.3.post2
+PyYAML==6.0.1
+tomli==2.0.1
+setuptools==69.5.1

package/generator/setup.py

@@ -48,9 +48,12 @@ setup(
         ]
     ),
     install_requires=[
-        "Jinja2 >= 2.11",  # I need "include" and auto-context + blank line are not indented by default
-        "pyyaml",
-        "m2r2",
-        "black",
+        "black==24.8.0",
+        "docutils>=0.20.1",
+        "Jinja2==3.1.3",
+        "m2r2==0.3.3.post2",
+        "PyYAML==6.0.1",
+        "tomli==2.0.1",
+        "setuptools==69.5.1",
     ],
 )

package/generator/test/azure/mock_api_tests/asynctests/test_azure_client_generator_core_flatten_async.py

@@ -19,7 +19,7 @@ async def client():
         yield client
 
 
-# ========== test for cadl-ranch ==========
+# ========== test for spector ==========
 
 
 @pytest.mark.asyncio

package/generator/test/{generic_mock_api_tests/asynctests/test_payload_pageable_async.py → azure/mock_api_tests/asynctests/test_azure_payload_pageable_async.py}

@@ -4,7 +4,7 @@
 # license information.
 # --------------------------------------------------------------------------
 import pytest
-from payload.pageable.aio import PageableClient
+from specs.azure.payload.pageable.aio import PageableClient
 
 
 @pytest.fixture

package/generator/test/azure/mock_api_tests/conftest.py

@@ -13,9 +13,10 @@ from pathlib import Path
 
 
 def start_server_process():
-    path = Path(os.path.dirname(__file__)) / Path("../../../../node_modules/@azure-tools/cadl-ranch-specs")
-    os.chdir(path.resolve())
-    cmd = "cadl-ranch serve ./http  --coverageFile ./cadl-ranch-coverage-python-standard.json"
+    azure_http_path = Path(os.path.dirname(__file__)) / Path("../../../../node_modules/@azure-tools/azure-http-specs")
+    http_path = Path(os.path.dirname(__file__)) / Path("../../../../node_modules/@typespec/http-specs")
+    os.chdir(azure_http_path.resolve())
+    cmd = f"tsp-spector serve ./specs  {(http_path / 'specs').resolve()}"
     if os.name == "nt":
         return subprocess.Popen(cmd, shell=True)
     return subprocess.Popen(cmd, shell=True, preexec_fn=os.setsid)
@@ -30,7 +31,7 @@ def terminate_server_process(process):
 
 @pytest.fixture(scope="session", autouse=True)
 def testserver():
-    """Start cadl ranch mock api tests"""
+    """Start spector ranch mock api tests"""
     server = start_server_process()
     yield
     terminate_server_process(server)

package/generator/test/azure/mock_api_tests/test_azure_client_generator_core_flatten.py

@@ -19,7 +19,7 @@ def client():
         yield client
 
 
-# ========== test for cadl-ranch ==========
+# ========== test for spector ==========
 
 
 def test_put_flatten_model(client: FlattenPropertyClient):

package/generator/test/{generic_mock_api_tests/test_payload_pageable.py → azure/mock_api_tests/test_azure_payload_pageable.py}

@@ -4,7 +4,7 @@
 # license information.
 # --------------------------------------------------------------------------
 import pytest
-from payload.pageable import PageableClient
+from specs.azure.payload.pageable import PageableClient
 
 
 @pytest.fixture