@typespec/http-client-python 0.8.0 → 0.8.2

package/emitter/src/code-model.ts

@@ -32,15 +32,10 @@ import {
   simpleTypesMap,
   typesMap,
 } from "./types.js";
-import {
-  emitParamBase,
-  getClientNamespace,
-  getImplementation,
-  removeUnderscoresFromNamespace,
-} from "./utils.js";
+import { emitParamBase, getClientNamespace, getImplementation, getRootNamespace } from "./utils.js";
 
 function emitBasicMethod<TServiceOperation extends SdkServiceOperation>(
-  context: PythonSdkContext<TServiceOperation>,
+  context: PythonSdkContext,
   rootClient: SdkClientType<TServiceOperation>,
   method: SdkBasicServiceMethod<TServiceOperation>,
   operationGroupName: string,
@@ -56,7 +51,7 @@ function emitBasicMethod<TServiceOperation extends SdkServiceOperation>(
 }
 
 function emitLroMethod<TServiceOperation extends SdkServiceOperation>(
-  context: PythonSdkContext<TServiceOperation>,
+  context: PythonSdkContext,
   rootClient: SdkClientType<TServiceOperation>,
   method: SdkLroServiceMethod<TServiceOperation>,
   operationGroupName: string,
@@ -72,7 +67,7 @@ function emitLroMethod<TServiceOperation extends SdkServiceOperation>(
 }
 
 function emitPagingMethod<TServiceOperation extends SdkServiceOperation>(
-  context: PythonSdkContext<TServiceOperation>,
+  context: PythonSdkContext,
   rootClient: SdkClientType<TServiceOperation>,
   method: SdkPagingServiceMethod<TServiceOperation>,
   operationGroupName: string,
@@ -88,7 +83,7 @@ function emitPagingMethod<TServiceOperation extends SdkServiceOperation>(
 }
 
 function emitLroPagingMethod<TServiceOperation extends SdkServiceOperation>(
-  context: PythonSdkContext<TServiceOperation>,
+  context: PythonSdkContext,
   rootClient: SdkClientType<TServiceOperation>,
   method: SdkLroPagingServiceMethod<TServiceOperation>,
   operationGroupName: string,
@@ -103,8 +98,8 @@ function emitLroPagingMethod<TServiceOperation extends SdkServiceOperation>(
   }
 }
 
-function emitMethodParameter<TServiceOperation extends SdkServiceOperation>(
-  context: PythonSdkContext<TServiceOperation>,
+function emitMethodParameter(
+  context: PythonSdkContext,
   parameter: SdkEndpointParameter | SdkCredentialParameter | SdkMethodParameter,
 ): Record<string, any>[] {
   if (parameter.kind === "endpoint") {
@@ -158,7 +153,7 @@ function emitMethodParameter<TServiceOperation extends SdkServiceOperation>(
 }
 
 function emitMethod<TServiceOperation extends SdkServiceOperation>(
-  context: PythonSdkContext<TServiceOperation>,
+  context: PythonSdkContext,
   rootClient: SdkClientType<TServiceOperation>,
   method: SdkServiceMethod<TServiceOperation>,
   operationGroupName: string,
@@ -176,7 +171,7 @@ function emitMethod<TServiceOperation extends SdkServiceOperation>(
 }
 
 function emitOperationGroups<TServiceOperation extends SdkServiceOperation>(
-  context: PythonSdkContext<TServiceOperation>,
+  context: PythonSdkContext,
   client: SdkClientType<TServiceOperation>,
   rootClient: SdkClientType<TServiceOperation>,
   prefix: string,
@@ -232,7 +227,7 @@ function emitOperationGroups<TServiceOperation extends SdkServiceOperation>(
 }
 
 function emitClient<TServiceOperation extends SdkServiceOperation>(
-  context: PythonSdkContext<TServiceOperation>,
+  context: PythonSdkContext,
   client: SdkClientType<TServiceOperation>,
 ): Record<string, any> {
   if (client.clientInitialization) {
@@ -275,13 +270,11 @@ function onlyUsedByPolling(usage: UsageFlags): boolean {
   );
 }
 
-export function emitCodeModel<TServiceOperation extends SdkServiceOperation>(
-  sdkContext: PythonSdkContext<TServiceOperation>,
-) {
+export function emitCodeModel(sdkContext: PythonSdkContext) {
   // Get types
   const sdkPackage = sdkContext.sdkPackage;
   const codeModel: Record<string, any> = {
-    namespace: removeUnderscoresFromNamespace(sdkPackage.rootNamespace).toLowerCase(),
+    namespace: getRootNamespace(sdkContext),
     clients: [],
   };
   for (const client of sdkPackage.clients) {

package/emitter/src/emitter.ts

@@ -1,9 +1,4 @@
-import {
-  createSdkContext,
-  SdkContext,
-  SdkHttpOperation,
-  SdkServiceOperation,
-} from "@azure-tools/typespec-client-generator-core";
+import { createSdkContext } from "@azure-tools/typespec-client-generator-core";
 import { EmitContext, NoTarget } from "@typespec/compiler";
 import { execSync } from "child_process";
 import fs from "fs";
@@ -16,60 +11,53 @@ import { saveCodeModelAsYaml } from "./external-process.js";
 import { PythonEmitterOptions, PythonSdkContext, reportDiagnostic } from "./lib.js";
 import { runPython3 } from "./run-python3.js";
 import { disableGenerationMap, simpleTypesMap, typesMap } from "./types.js";
-import { md2Rst, removeUnderscoresFromNamespace } from "./utils.js";
+import { getRootNamespace, md2Rst } from "./utils.js";
 
-export function getModelsMode(context: SdkContext): "dpg" | "none" {
-  const specifiedModelsMode = context.emitContext.options["models-mode"];
-  if (specifiedModelsMode) {
-    const modelModes = ["dpg", "none"];
-    if (modelModes.includes(specifiedModelsMode)) {
-      return specifiedModelsMode;
-    }
-    reportDiagnostic(context.program, {
-      code: "invalid-models-mode",
-      target: NoTarget,
-      format: { inValidValue: specifiedModelsMode },
-    });
-  }
-  return "dpg";
-}
-
-function addDefaultOptions(sdkContext: SdkContext) {
+function addDefaultOptions(sdkContext: PythonSdkContext) {
   const defaultOptions = {
     "package-version": "1.0.0b1",
     "generate-packaging-files": true,
-    flavor: undefined,
   };
   sdkContext.emitContext.options = {
     ...defaultOptions,
     ...sdkContext.emitContext.options,
   };
   const options = sdkContext.emitContext.options;
-  options["models-mode"] = getModelsMode(sdkContext);
-  if (options["generate-packaging-files"]) {
-    options["package-mode"] = sdkContext.arm ? "azure-mgmt" : "azure-dataplane";
-  }
   if (!options["package-name"]) {
-    options["package-name"] = removeUnderscoresFromNamespace(
-      (sdkContext.sdkPackage.rootNamespace ?? "").toLowerCase(),
-    ).replace(/\./g, "-");
+    const namespace = getRootNamespace(sdkContext);
+    const packageName = namespace.replace(/\./g, "-");
+    reportDiagnostic(sdkContext.program, {
+      code: "no-package-name",
+      target: NoTarget,
+      format: { namespace, packageName },
+    });
+    options["package-name"] = packageName;
   }
-  if (options.flavor !== "azure") {
+  if ((options as any).flavor !== "azure") {
     // if they pass in a flavor other than azure, we want to ignore the value
-    options.flavor = undefined;
+    (options as any).flavor = undefined;
   }
-  if (!options.flavor && sdkContext.emitContext.emitterOutputDir.includes("azure")) {
-    options.flavor = "azure";
+  if (
+    (options as any).flavor === undefined &&
+    sdkContext.emitContext.emitterOutputDir.includes("azure")
+  ) {
+    (options as any).flavor = "azure";
   }
-  if (options["enable-typespec-namespace"] === undefined) {
-    options["enable-typespec-namespace"] = options.flavor !== "azure";
+
+  if (
+    options["package-pprint-name"] !== undefined &&
+    !options["package-pprint-name"].startsWith('"')
+  ) {
+    options["package-pprint-name"] = options["use-pyodide"]
+      ? `${options["package-pprint-name"]}`
+      : `"${options["package-pprint-name"]}"`;
   }
 }
 
-async function createPythonSdkContext<TServiceOperation extends SdkServiceOperation>(
+async function createPythonSdkContext(
   context: EmitContext<PythonEmitterOptions>,
-): Promise<PythonSdkContext<TServiceOperation>> {
-  const sdkContext = await createSdkContext<PythonEmitterOptions, TServiceOperation>(
+): Promise<PythonSdkContext> {
+  const sdkContext = await createSdkContext<PythonEmitterOptions>(
     context,
     "@azure-tools/typespec-python",
   );
@@ -146,7 +134,7 @@ async function onEmitMain(context: EmitContext<PythonEmitterOptions>) {
   cleanAllCache();
 
   const program = context.program;
-  const sdkContext = await createPythonSdkContext<SdkHttpOperation>(context);
+  const sdkContext = await createPythonSdkContext(context);
   const root = path.join(dirname(fileURLToPath(import.meta.url)), "..", "..");
   const outputDir = context.emitterOutputDir;
   addDefaultOptions(sdkContext);
@@ -173,25 +161,21 @@ async function onEmitMain(context: EmitContext<PythonEmitterOptions>) {
     commandArgs["packaging-files-config"] = keyValuePairs.join("|");
     resolvedOptions["packaging-files-config"] = undefined;
   }
-  if (
-    resolvedOptions["package-pprint-name"] !== undefined &&
-    !resolvedOptions["package-pprint-name"].startsWith('"')
-  ) {
-    resolvedOptions["package-pprint-name"] = resolvedOptions["use-pyodide"]
-      ? `${resolvedOptions["package-pprint-name"]}`
-      : `"${resolvedOptions["package-pprint-name"]}"`;
-  }
 
   for (const [key, value] of Object.entries(resolvedOptions)) {
     commandArgs[key] = value;
   }
+  if (resolvedOptions["generate-packaging-files"]) {
+    commandArgs["package-mode"] = sdkContext.arm ? "azure-mgmt" : "azure-dataplane";
+  }
   if (sdkContext.arm === true) {
     commandArgs["azure-arm"] = "true";
   }
-  if (resolvedOptions.flavor === "azure") {
+  if ((resolvedOptions as any).flavor === "azure") {
     commandArgs["emit-cross-language-definition-file"] = "true";
   }
   commandArgs["from-typespec"] = "true";
+  commandArgs["models-mode"] = (resolvedOptions as any)["models-mode"] ?? "dpg";
 
   if (!program.compilerOptions.noEmit && !program.hasError()) {
     // if not using pyodide and there's no venv, we try to create venv

package/emitter/src/http.ts

@@ -48,7 +48,7 @@ function arrayToRecord(examples: SdkHttpOperationExample[] | undefined): Record<
 }
 
 export function emitBasicHttpMethod(
-  context: PythonSdkContext<SdkHttpOperation>,
+  context: PythonSdkContext,
   rootClient: SdkClientType<SdkHttpOperation>,
   method: SdkBasicServiceMethod<SdkHttpOperation>,
   operationGroupName: string,
@@ -65,7 +65,7 @@ export function emitBasicHttpMethod(
 }
 
 function emitInitialLroHttpMethod(
-  context: PythonSdkContext<SdkHttpOperation>,
+  context: PythonSdkContext,
   rootClient: SdkClientType<SdkHttpOperation>,
   method: SdkLroServiceMethod<SdkHttpOperation> | SdkLroPagingServiceMethod<SdkHttpOperation>,
   operationGroupName: string,
@@ -82,7 +82,7 @@ function emitInitialLroHttpMethod(
 }
 
 function addLroInformation(
-  context: PythonSdkContext<SdkHttpOperation>,
+  context: PythonSdkContext,
   rootClient: SdkClientType<SdkHttpOperation>,
   method: SdkLroServiceMethod<SdkHttpOperation> | SdkLroPagingServiceMethod<SdkHttpOperation>,
   operationGroupName: string,
@@ -110,7 +110,7 @@ function getWireNameFromPropertySegments(segments: SdkModelPropertyType[]): stri
 }
 
 function getWireNameWithDiagnostics(
-  context: PythonSdkContext<SdkHttpOperation>,
+  context: PythonSdkContext,
   segments: SdkModelPropertyType[] | undefined,
   code: "invalid-paging-items" | "invalid-next-link" | "invalid-lro-result",
   method?: SdkServiceMethod<SdkHttpOperation>,
@@ -132,7 +132,7 @@ function getWireNameWithDiagnostics(
 }
 
 function buildContinuationToken(
-  context: PythonSdkContext<SdkHttpOperation>,
+  context: PythonSdkContext,
   method: SdkPagingServiceMethod<SdkHttpOperation> | SdkLroPagingServiceMethod<SdkHttpOperation>,
   segments: SdkModelPropertyType[],
   input: boolean = true,
@@ -166,7 +166,7 @@ function buildContinuationToken(
 }
 
 function buildAllContinuationToken(
-  context: PythonSdkContext<SdkHttpOperation>,
+  context: PythonSdkContext,
   method: SdkPagingServiceMethod<SdkHttpOperation> | SdkLroPagingServiceMethod<SdkHttpOperation>,
 ): Record<string, any> {
   const parameterSegments = method.pagingMetadata.continuationTokenParameterSegments ?? [];
@@ -181,7 +181,7 @@ function buildAllContinuationToken(
 }
 
 function addPagingInformation(
-  context: PythonSdkContext<SdkHttpOperation>,
+  context: PythonSdkContext,
   rootClient: SdkClientType<SdkHttpOperation>,
   method: SdkPagingServiceMethod<SdkHttpOperation> | SdkLroPagingServiceMethod<SdkHttpOperation>,
   operationGroupName: string,
@@ -223,7 +223,7 @@ function addPagingInformation(
 }
 
 export function emitLroHttpMethod(
-  context: PythonSdkContext<SdkHttpOperation>,
+  context: PythonSdkContext,
   rootClient: SdkClientType<SdkHttpOperation>,
   method: SdkLroServiceMethod<SdkHttpOperation>,
   operationGroupName: string,
@@ -233,7 +233,7 @@ export function emitLroHttpMethod(
 }
 
 export function emitPagingHttpMethod(
-  context: PythonSdkContext<SdkHttpOperation>,
+  context: PythonSdkContext,
   rootClient: SdkClientType<SdkHttpOperation>,
   method: SdkPagingServiceMethod<SdkHttpOperation>,
   operationGroupName: string,
@@ -243,7 +243,7 @@ export function emitPagingHttpMethod(
 }
 
 export function emitLroPagingHttpMethod(
-  context: PythonSdkContext<SdkHttpOperation>,
+  context: PythonSdkContext,
   rootClient: SdkClientType<SdkHttpOperation>,
   method: SdkLroPagingServiceMethod<SdkHttpOperation>,
   operationGroupName: string,
@@ -254,7 +254,7 @@ export function emitLroPagingHttpMethod(
 }
 
 function emitHttpOperation(
-  context: PythonSdkContext<SdkHttpOperation>,
+  context: PythonSdkContext,
   rootClient: SdkClientType<SdkHttpOperation>,
   operationGroupName: string,
   operation: SdkHttpOperation,
@@ -339,10 +339,7 @@ function emitFlattenedParameter(
   };
 }
 
-function emitHttpPathParameter(
-  context: PythonSdkContext<SdkHttpOperation>,
-  parameter: SdkPathParameter,
-) {
+function emitHttpPathParameter(context: PythonSdkContext, parameter: SdkPathParameter) {
   const base = emitParamBase(context, parameter);
   return {
     ...base,
@@ -354,7 +351,7 @@ function emitHttpPathParameter(
   };
 }
 function emitHttpHeaderParameter(
-  context: PythonSdkContext<SdkHttpOperation>,
+  context: PythonSdkContext,
   parameter: SdkHeaderParameter,
   method: SdkServiceMethod<SdkHttpOperation>,
 ): Record<string, any> {
@@ -380,7 +377,7 @@ function emitHttpHeaderParameter(
 }
 
 function emitHttpQueryParameter(
-  context: PythonSdkContext<SdkHttpOperation>,
+  context: PythonSdkContext,
   parameter: SdkQueryParameter,
   method: SdkServiceMethod<SdkHttpOperation>,
 ): Record<string, any> {
@@ -398,7 +395,7 @@ function emitHttpQueryParameter(
 }
 
 function emitHttpParameters(
-  context: PythonSdkContext<SdkHttpOperation>,
+  context: PythonSdkContext,
   rootClient: SdkClientType<SdkHttpOperation>,
   operation: SdkHttpOperation,
   method: SdkServiceMethod<SdkHttpOperation>,
@@ -421,7 +418,7 @@ function emitHttpParameters(
 }
 
 function emitHttpBodyParameter(
-  context: PythonSdkContext<SdkHttpOperation>,
+  context: PythonSdkContext,
   bodyParam?: SdkBodyParameter,
 ): Record<string, any> | undefined {
   if (bodyParam === undefined) return undefined;
@@ -438,7 +435,7 @@ function emitHttpBodyParameter(
 }
 
 function emitHttpResponse(
-  context: PythonSdkContext<SdkHttpOperation>,
+  context: PythonSdkContext,
   statusCodes: HttpStatusCodeRange | number | "*",
   response: SdkHttpResponse | SdkHttpErrorResponse,
   method?: SdkServiceMethod<SdkHttpOperation>,
@@ -479,7 +476,7 @@ function emitHttpResponse(
 }
 
 function emitHttpResponseHeader(
-  context: PythonSdkContext<SdkHttpOperation>,
+  context: PythonSdkContext,
   header: SdkServiceResponseHeader,
 ): Record<string, any> {
   return {

package/emitter/src/index.ts

@@ -1,2 +1,2 @@
 export * from "./emitter.js";
-export { $lib } from "./lib.js";
+export { $lib, PythonEmitterOptions, PythonEmitterOptionsSchema } from "./lib.js";

package/emitter/src/lib.ts

@@ -1,54 +1,82 @@
-import { SdkContext, SdkServiceOperation } from "@azure-tools/typespec-client-generator-core";
+import {
+  SdkContext,
+  SdkEmitterOptions,
+  SdkEmitterOptionsSchema,
+} from "@azure-tools/typespec-client-generator-core";
 import { createTypeSpecLibrary, JSONSchemaType, paramMessage } from "@typespec/compiler";
 
-export interface PythonEmitterOptions {
+export interface PythonEmitterOptions extends SdkEmitterOptions {
   "package-version"?: string;
   "package-name"?: string;
-  "output-dir"?: string;
   "generate-packaging-files"?: boolean;
   "packaging-files-dir"?: string;
   "packaging-files-config"?: object;
   "package-pprint-name"?: string;
   "head-as-boolean"?: boolean;
-  "models-mode"?: string;
-  tracing?: boolean;
   "company-name"?: string;
-  "generate-test"?: boolean;
-  debug?: boolean;
-  flavor?: "azure";
-  "examples-dir"?: string;
-  // If true, package namespace will respect the typespec namespace. Otherwise,
-  // package namespace is always aligned with package name.
-  "enable-typespec-namespace"?: boolean;
   "use-pyodide"?: boolean;
 }
 
-export interface PythonSdkContext<TServiceOperation extends SdkServiceOperation>
-  extends SdkContext<PythonEmitterOptions, TServiceOperation> {
+export interface PythonSdkContext extends SdkContext<PythonEmitterOptions> {
   __endpointPathParameters: Record<string, any>[];
 }
 
-const EmitterOptionsSchema: JSONSchemaType<PythonEmitterOptions> = {
+export const PythonEmitterOptionsSchema: JSONSchemaType<PythonEmitterOptions> = {
   type: "object",
   additionalProperties: true,
   properties: {
-    "package-version": { type: "string", nullable: true },
-    "package-name": { type: "string", nullable: true },
-    "output-dir": { type: "string", nullable: true },
-    "generate-packaging-files": { type: "boolean", nullable: true },
-    "packaging-files-dir": { type: "string", nullable: true },
-    "packaging-files-config": { type: "object", nullable: true },
-    "package-pprint-name": { type: "string", nullable: true },
-    "head-as-boolean": { type: "boolean", nullable: true },
-    "models-mode": { type: "string", nullable: true },
-    tracing: { type: "boolean", nullable: true },
-    "company-name": { type: "string", nullable: true },
-    "generate-test": { type: "boolean", nullable: true },
-    debug: { type: "boolean", nullable: true },
-    flavor: { type: "string", nullable: true },
-    "examples-dir": { type: "string", nullable: true, format: "absolute-path" },
-    "enable-typespec-namespace": { type: "boolean", nullable: true },
-    "use-pyodide": { type: "boolean", nullable: true },
+    "package-version": {
+      type: "string",
+      nullable: true,
+      description: "The version of the package.",
+    },
+    "package-name": {
+      type: "string",
+      nullable: true,
+      description: "The name of the package.",
+    },
+    "generate-packaging-files": {
+      type: "boolean",
+      nullable: true,
+      description:
+        "Whether to generate packaging files. Packaging files refer to the `setup.py`, `README`, and other files that are needed to package your code.",
+    },
+    "packaging-files-dir": {
+      type: "string",
+      nullable: true,
+      description:
+        "If you are using a custom packaging files directory, you can specify it here. We won't generate with the default packaging files we have.",
+    },
+    "packaging-files-config": {
+      type: "object",
+      nullable: true,
+      description:
+        "If you are using a custom packaging files directory, and have additional configuration parameters you want to pass in during generation, you can specify it here. Only applicable if `packaging-files-dir` is set.",
+    },
+    "package-pprint-name": {
+      type: "string",
+      nullable: true,
+      description:
+        "The name of the package to be used in pretty-printing. Will be the name of the package in `README` and pprinting of `setup.py`.",
+    },
+    "head-as-boolean": {
+      type: "boolean",
+      nullable: true,
+      description: "Whether to return responses from HEAD requests as boolean. Defaults to `true`.",
+    },
+    "company-name": {
+      type: "string",
+      nullable: true,
+      description:
+        "The name of the company. This will be reflected in your license files and documentation.",
+    },
+    "use-pyodide": {
+      type: "boolean",
+      nullable: true,
+      description:
+        "Whether to generate using `pyodide` instead of `python`. If there is no python installed on your device, we will default to using pyodide to generate the code.",
+    },
+    ...SdkEmitterOptionsSchema.properties,
   },
   required: [],
 };
@@ -63,12 +91,6 @@ const libDef = {
         default: paramMessage`Can't generate Python client code from this TypeSpec. Please open an issue on https://github.com/microsoft/typespec'.${"stack"}`,
       },
     },
-    "invalid-models-mode": {
-      severity: "error",
-      messages: {
-        default: paramMessage`Invalid value '${"inValidValue"}' for 'models-mode' of tspconfig.yaml and expected values are 'dpg'/'none'.`,
-      },
-    },
     "pyodide-flag-conflict": {
       severity: "error",
       messages: {
@@ -77,6 +99,12 @@ const libDef = {
       },
     },
     // warning
+    "no-package-name": {
+      severity: "warning",
+      messages: {
+        default: paramMessage`No package-name configured in tspconfig.yaml and will infer package-name '${"packageName"}' from namespace '${"namespace"}'.`,
+      },
+    },
     "no-valid-client": {
       severity: "warning",
       messages: {
@@ -109,9 +137,9 @@ const libDef = {
     },
   },
   emitter: {
-    options: EmitterOptionsSchema as JSONSchemaType<PythonEmitterOptions>,
+    options: PythonEmitterOptionsSchema,
   },
 } as const;
 
 export const $lib = createTypeSpecLibrary(libDef);
-export const { reportDiagnostic, createStateSymbol, getTracer } = $lib;
+export const { reportDiagnostic, createDiagnostic } = $lib;

package/emitter/src/types.ts

@@ -11,7 +11,6 @@ import {
   SdkEnumType,
   SdkEnumValueType,
   SdkModelType,
-  SdkServiceOperation,
   SdkType,
   SdkUnionType,
   UsageFlags,
@@ -70,8 +69,8 @@ export function getSimpleTypeResult(result: Record<string, any>): Record<string,
   return result;
 }
 
-export function getType<TServiceOperation extends SdkServiceOperation>(
-  context: PythonSdkContext<TServiceOperation>,
+export function getType(
+  context: PythonSdkContext,
   type: CredentialType | CredentialTypeUnion | Type | SdkType | MultiPartFileType,
 ): Record<string, any> {
   switch (type.kind) {
@@ -128,8 +127,8 @@ export function getType<TServiceOperation extends SdkServiceOperation>(
   }
 }
 
-function emitMultiPartFile<TServiceOperation extends SdkServiceOperation>(
-  context: PythonSdkContext<TServiceOperation>,
+function emitMultiPartFile(
+  context: PythonSdkContext,
   type: MultiPartFileType,
 ): Record<string, any> {
   if (type.type.kind === "array") {
@@ -218,12 +217,12 @@ function addDisableGenerationMap(type: SdkType): void {
   }
 }
 
-function emitProperty<TServiceOperation extends SdkServiceOperation>(
-  context: PythonSdkContext<TServiceOperation>,
+function emitProperty(
+  context: PythonSdkContext,
   model: SdkModelType,
   property: SdkBodyModelPropertyType,
 ): Record<string, any> {
-  const isMultipartFileInput = property.multipartOptions?.isFilePart;
+  const isMultipartFileInput = property.serializationOptions?.multipart?.isFilePart;
   let sourceType: SdkType | MultiPartFileType = property.type;
   if (isMultipartFileInput) {
     sourceType = createMultiPartFileType(property.type);
@@ -254,10 +253,7 @@ function emitProperty<TServiceOperation extends SdkServiceOperation>(
   };
 }
 
-function emitModel<TServiceOperation extends SdkServiceOperation>(
-  context: PythonSdkContext<TServiceOperation>,
-  type: SdkModelType,
-): Record<string, any> {
+function emitModel(context: PythonSdkContext, type: SdkModelType): Record<string, any> {
   if (isEmptyModel(type)) {
     return KnownTypes.any;
   }
@@ -320,10 +316,7 @@ function emitModel<TServiceOperation extends SdkServiceOperation>(
   return newValue;
 }
 
-function emitEnum<TServiceOperation extends SdkServiceOperation>(
-  context: PythonSdkContext<TServiceOperation>,
-  type: SdkEnumType,
-): Record<string, any> {
+function emitEnum(context: PythonSdkContext, type: SdkEnumType): Record<string, any> {
   if (typesMap.has(type)) {
     return typesMap.get(type)!;
   }
@@ -401,8 +394,8 @@ function emitDurationOrDateType(type: SdkDurationType | SdkDateTimeType): Record
   });
 }
 
-function emitArrayOrDict<TServiceOperation extends SdkServiceOperation>(
-  context: PythonSdkContext<TServiceOperation>,
+function emitArrayOrDict(
+  context: PythonSdkContext,
   type: SdkArrayType | SdkDictionaryType,
 ): Record<string, any> {
   const kind = type.kind === "array" ? "list" : type.kind;
@@ -470,10 +463,7 @@ function emitBuiltInType(
   });
 }
 
-function emitUnion<TServiceOperation extends SdkServiceOperation>(
-  context: PythonSdkContext<TServiceOperation>,
-  type: SdkUnionType,
-): Record<string, any> {
+function emitUnion(context: PythonSdkContext, type: SdkUnionType): Record<string, any> {
   return getSimpleTypeResult({
     name: type.isGeneratedName ? undefined : type.name,
     snakeCaseName: type.isGeneratedName ? undefined : camelToSnakeCase(type.name),
@@ -508,8 +498,8 @@ export const KnownTypes = {
   any: { type: "any" },
 };
 
-export function emitEndpointType<TServiceOperation extends SdkServiceOperation>(
-  context: PythonSdkContext<TServiceOperation>,
+export function emitEndpointType(
+  context: PythonSdkContext,
   type: SdkEndpointType,
 ): Record<string, any>[] {
   const params: Record<string, any>[] = [];
@@ -523,7 +513,7 @@ export function emitEndpointType<TServiceOperation extends SdkServiceOperation>(
       location: "endpointPath",
       implementation: getImplementation(context, param),
       clientDefaultValue: param.clientDefaultValue,
-      skipUrlEncoding: param.urlEncode === false,
+      skipUrlEncoding: param.allowReserved === false,
     });
     context.__endpointPathParameters!.push(params.at(-1)!);
   }