@typespec/http-client-python 0.4.4 → 0.5.1

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

@@ -90,8 +90,10 @@ def test_add_optional_param_from_one_optional():
         client.from_one_optional(parameter="optional", new_parameter="new")
 
 
-def test_break_the_glass(core_library):
-    request = core_library.rest.HttpRequest(method="DELETE", url="/add-operation")
+def test_break_the_glass():
+    from azure.core.rest import HttpRequest
+
+    request = HttpRequest(method="DELETE", url="/add-operation")
     with V1Client(
         endpoint="http://localhost:3000",
         service_deployment_version="v2",

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

@@ -94,8 +94,9 @@ async def test_add_optional_param_from_one_optional():
 
 
 @pytest.mark.asyncio
-async def test_break_the_glass(core_library):
-    request = core_library.rest.HttpRequest(method="DELETE", url="/add-operation")
+async def test_break_the_glass():
+    from azure.core.rest import HttpRequest
+    request = HttpRequest(method="DELETE", url="/add-operation")
     async with V1Client(
         endpoint="http://localhost:3000",
         service_deployment_version="v2",

package/generator/test/azure/requirements.txt

@@ -1,4 +1,4 @@
-setuptools==69.2.0
+setuptools==69.5.1
 -e ../../
 aiohttp;python_full_version>="3.5.2"
 requests==2.32.2
@@ -26,20 +26,25 @@ mypy==1.13.0
 -e ./generated/azure-example-basic
 -e ./generated/azure-resource-manager-common-properties
 -e ./generated/azure-resource-manager-resources
+-e ./generated/azure-payload-pageable
+-e ./generated/client-naming
+-e ./generated/client-structure-default
+-e ./generated/client-structure-multiclient
+-e ./generated/client-structure-renamedoperation
+-e ./generated/client-structure-twooperationgroup
+-e ./generated/resiliency-srv-driven1
+-e ./generated/resiliency-srv-driven2
 
 # common test case
 -e ./generated/authentication-api-key
 -e ./generated/authentication-http-custom
 -e ./generated/authentication-oauth2
 -e ./generated/authentication-union
--e ./generated/client-naming
 -e ./generated/encode-duration
 -e ./generated/encode-numeric
 -e ./generated/parameters-basic
 -e ./generated/parameters-collection-format
 -e ./generated/parameters-spread
--e ./generated/resiliency-srv-driven1
--e ./generated/resiliency-srv-driven2
 -e ./generated/serialization-encoded-name-json
 -e ./generated/server-endpoint-not-defined
 -e ./generated/server-path-multiple
@@ -72,10 +77,6 @@ mypy==1.13.0
 -e ./generated/special-headers-conditional-request
 -e ./generated/encode-datetime
 -e ./generated/encode-bytes
--e ./generated/client-structure-default
--e ./generated/client-structure-multiclient
--e ./generated/client-structure-renamedoperation
--e ./generated/client-structure-twooperationgroup
 -e ./generated/payload-content-negotiation
 -e ./generated/payload-json-merge-patch
 -e ./generated/payload-pageable

package/generator/test/generic_mock_api_tests/conftest.py

@@ -15,9 +15,14 @@ FILE_FOLDER = Path(__file__).parent
 
 
 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"
+    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")
+    if "unbranded" in Path(os.getcwd()).parts:
+        os.chdir(http_path.resolve())
+        cmd = "npx tsp-spector serve ./specs"
+    else:
+        os.chdir(azure_http_path.resolve())
+        cmd = f"npx 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)
@@ -32,7 +37,7 @@ def terminate_server_process(process):
 
 @pytest.fixture(scope="session", autouse=True)
 def testserver():
-    """Start cadl ranch mock api tests"""
+    """Start spector mock api tests"""
     server = start_server_process()
     yield
     terminate_server_process(server)

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

@@ -12,9 +12,9 @@ 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"
+    http_path = Path(os.path.dirname(__file__)) / Path("../../../../node_modules/@typespec/http-specs")
+    os.chdir(http_path.resolve())
+    cmd = "tsp-spector serve ./specs"
     if os.name == "nt":
         return subprocess.Popen(cmd, shell=True)
     return subprocess.Popen(cmd, shell=True, preexec_fn=os.setsid)
@@ -29,7 +29,7 @@ def terminate_server_process(process):
 
 @pytest.fixture(scope="session", autouse=True)
 def testserver():
-    """Start cadl ranch mock api tests"""
+    """Start spector mock api tests"""
     server = start_server_process()
     yield
     terminate_server_process(server)

package/generator/test/unbranded/mock_api_tests/test_unbranded.py

@@ -53,5 +53,5 @@ def check_sensitive_word(folder: Path, word: str) -> str:
 def test_sensitive_word():
     check_folder = (Path(os.path.dirname(__file__)) / "../generated").resolve()
     assert [] == check_sensitive_word(check_folder, "azure")
-    # after update cadl-ranch, it shall also equal to []
+    # after update spector, it shall also equal to []
     assert ["authentication-oauth2", "authentication-union"] == check_sensitive_word(check_folder, "microsoft")

package/generator/test/unbranded/requirements.txt

@@ -1,4 +1,4 @@
-setuptools==69.2.0
+setuptools==69.5.1
 -e ../../
 aiohttp;python_full_version>="3.5.2"
 requests==2.32.2
@@ -15,14 +15,11 @@ mypy==1.13.0
 -e ./generated/authentication-http-custom
 -e ./generated/authentication-oauth2
 -e ./generated/authentication-union
--e ./generated/client-naming
 -e ./generated/encode-duration
 -e ./generated/encode-numeric
 -e ./generated/parameters-basic
 -e ./generated/parameters-collection-format
 -e ./generated/parameters-spread
--e ./generated/resiliency-srv-driven1
--e ./generated/resiliency-srv-driven2
 -e ./generated/serialization-encoded-name-json
 -e ./generated/server-endpoint-not-defined
 -e ./generated/server-path-multiple
@@ -55,10 +52,6 @@ mypy==1.13.0
 -e ./generated/special-headers-conditional-request
 -e ./generated/encode-datetime
 -e ./generated/encode-bytes
--e ./generated/client-structure-default
--e ./generated/client-structure-multiclient
--e ./generated/client-structure-renamedoperation
--e ./generated/client-structure-twooperationgroup
 -e ./generated/payload-content-negotiation
 -e ./generated/payload-json-merge-patch
 -e ./generated/payload-pageable

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@typespec/http-client-python",
-  "version": "0.4.4",
+  "version": "0.5.1",
   "author": "Microsoft Corporation",
   "description": "TypeSpec emitter for Python SDKs",
   "homepage": "https://typespec.io",
@@ -30,13 +30,13 @@
   },
   "scripts": {
     "clean": "rimraf ./dist ./temp ./emitter/temp ./generator/test/azure/generated ./generator/test/unbranded/generated ./venv",
-    "build": "tsc -p ./emitter/tsconfig.build.json",
+    "build": "tsc -p ./emitter/tsconfig.build.json && tsx ./eng/scripts/setup/build.ts",
     "watch": "tsc -p ./emitter/tsconfig.build.json --watch",
     "lint": "eslint . --max-warnings=0",
     "lint:py": "tsx ./eng/scripts/ci/lint.ts --folderName generator/pygen",
     "format": "pnpm -w format:dir packages/http-client-python && tsx ./eng/scripts/ci/format.ts",
-    "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",
+    "install": "tsx ./eng/scripts/setup/install.ts",
+    "prepare": "tsx ./eng/scripts/setup/prepare.ts",
     "regenerate": "tsx ./eng/scripts/ci/regenerate.ts",
     "ci": "npm run test:emitter && npm run ci:generator --",
     "ci:generator": "tsx ./eng/scripts/ci/run-ci.ts",
@@ -60,12 +60,13 @@
     "@azure-tools/typespec-azure-resource-manager": ">=0.49.0 <1.0.0",
     "@azure-tools/typespec-autorest": ">=0.49.0 <1.0.0",
     "@azure-tools/typespec-azure-rulesets": ">=0.49.0 <3.0.0",
-    "@azure-tools/typespec-client-generator-core": ">=0.49.0 <1.0.0"
+    "@azure-tools/typespec-client-generator-core": ">=0.49.1 <1.0.0"
   },
   "dependencies": {
     "js-yaml": "~4.1.0",
     "semver": "~7.6.2",
-    "tsx": "~4.19.1"
+    "tsx": "~4.19.1",
+    "pyodide": "0.26.2"
   },
   "devDependencies": {
     "@typespec/compiler": "~0.63.0",
@@ -77,10 +78,9 @@
     "@azure-tools/typespec-azure-core": "~0.49.0",
     "@azure-tools/typespec-azure-rulesets": "~0.49.0",
     "@azure-tools/typespec-azure-resource-manager": "~0.49.0",
-    "@azure-tools/typespec-client-generator-core": "~0.49.0",
-    "@azure-tools/cadl-ranch-specs": "~0.39.6",
-    "@azure-tools/cadl-ranch-expect": "~0.15.7",
-    "@azure-tools/cadl-ranch": "~0.16.2",
+    "@azure-tools/typespec-client-generator-core": "~0.49.1",
+    "@azure-tools/azure-http-specs": "0.1.0-alpha.4",
+    "@typespec/http-specs": "0.1.0-alpha.5",
     "@types/js-yaml": "~4.0.5",
     "@types/node": "~22.5.4",
     "@types/semver": "7.5.8",

package/generator/requirements.txt

@@ -1,12 +0,0 @@
-black==24.4.0
-click==8.1.3
-docutils==0.19
-Jinja2==3.1.4
-m2r2==0.3.3
-MarkupSafe==2.1.2
-mistune==0.8.4
-pathspec==0.11.1
-platformdirs==3.2.0
-PyYAML==6.0.1
-tomli==2.0.1
-setuptools==69.2.0