Python multi namespace

packages/http-client-python/emitter/src/code-model.ts

@@ -32,7 +32,12 @@ import {
   simpleTypesMap,
   typesMap,
 } from "./types.js";
-import { emitParamBase, getImplementation, removeUnderscoresFromNamespace } from "./utils.js";
+import {
+  emitParamBase,
+  getClientNamespace,
+  getImplementation,
+  removeUnderscoresFromNamespace,
+} from "./utils.js";
 
 function emitBasicMethod<TServiceOperation extends SdkServiceOperation>(
   context: PythonSdkContext<TServiceOperation>,
@@ -193,6 +198,7 @@ function emitOperationGroups<TServiceOperation extends SdkServiceOperation>(
         propertyName: operationGroup.name,
         operations: operations,
         operationGroups: emitOperationGroups(context, operationGroup, rootClient, name),
+        clientNamespace: getClientNamespace(context, operationGroup.clientNamespace),
       });
     }
   }
@@ -210,10 +216,18 @@ function emitOperationGroups<TServiceOperation extends SdkServiceOperation>(
         className: "",
         propertyName: "",
         operations: operations,
+        clientNamespace: getClientNamespace(context, client.clientNamespace),
       });
     }
   }
 
+  // operation has same clientNamespace as the operation group
+  for (const og of operationGroups) {
+    for (const op of og.operations) {
+      op.clientNamespace = getClientNamespace(context, og.clientNamespace);
+    }
+  }
+
   return operationGroups.length > 0 ? operationGroups : undefined;
 }
 
@@ -247,6 +261,7 @@ function emitClient<TServiceOperation extends SdkServiceOperation>(
     url,
     apiVersions: client.apiVersions,
     arm: context.arm,
+    clientNamespace: getClientNamespace(context, client.clientNamespace),
   };
 }
 
@@ -268,14 +283,9 @@ export function emitCodeModel<TServiceOperation extends SdkServiceOperation>(
   const codeModel: Record<string, any> = {
     namespace: removeUnderscoresFromNamespace(sdkPackage.rootNamespace).toLowerCase(),
     clients: [],
-    subnamespaceToClients: {},
   };
   for (const client of sdkPackage.clients) {
     codeModel["clients"].push(emitClient(sdkContext, client));
-    if (client.nameSpace === sdkPackage.rootNamespace) {
-    } else {
-      codeModel["subnamespaceToClients"][client.nameSpace] = emitClient(sdkContext, client);
-    }
   }
   // loop through models and enums since there may be some orphaned models needs to be generated
   for (const model of sdkPackage.models) {

packages/http-client-python/emitter/src/lib.ts

@@ -17,6 +17,9 @@ export interface PythonEmitterOptions {
   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;
 }
 
@@ -44,6 +47,7 @@ const EmitterOptionsSchema: JSONSchemaType<PythonEmitterOptions> = {
     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 },
   },
   required: [],

packages/http-client-python/emitter/src/types.ts

@@ -21,7 +21,13 @@ import { Type } from "@typespec/compiler";
 import { HttpAuth, Visibility } from "@typespec/http";
 import { dump } from "js-yaml";
 import { PythonSdkContext } from "./lib.js";
-import { camelToSnakeCase, emitParamBase, getAddedOn, getImplementation } from "./utils.js";
+import {
+  camelToSnakeCase,
+  emitParamBase,
+  getAddedOn,
+  getClientNamespace,
+  getImplementation,
+} from "./utils.js";
 
 export const typesMap = new Map<SdkType, Record<string, any>>();
 export const simpleTypesMap = new Map<string | null, Record<string, any>>();
@@ -75,7 +81,7 @@ export function getType<TServiceOperation extends SdkServiceOperation>(
     case "union":
       return emitUnion(context, type);
     case "enum":
-      return emitEnum(type);
+      return emitEnum(context, type);
     case "constant":
       return emitConstant(type)!;
     case "array":
@@ -86,7 +92,7 @@ export function getType<TServiceOperation extends SdkServiceOperation>(
     case "duration":
       return emitDurationOrDateType(type);
     case "enumvalue":
-      return emitEnumMember(type, emitEnum(type.enumType));
+      return emitEnumMember(type, emitEnum(context, type.enumType));
     case "credential":
       return emitCredential(type);
     case "bytes":
@@ -289,6 +295,7 @@ function emitModel<TServiceOperation extends SdkServiceOperation>(
     usage: type.usage,
     isXml: type.usage & UsageFlags.Xml ? true : false,
     xmlMetadata: type.usage & UsageFlags.Xml ? getXmlMetadata(type) : undefined,
+    clientNamespace: getClientNamespace(context, type.clientNamespace),
   };
 
   typesMap.set(type, newValue);
@@ -314,7 +321,10 @@ function emitModel<TServiceOperation extends SdkServiceOperation>(
   return newValue;
 }
 
-function emitEnum(type: SdkEnumType): Record<string, any> {
+function emitEnum<TServiceOperation extends SdkServiceOperation>(
+  context: PythonSdkContext<TServiceOperation>,
+  type: SdkEnumType,
+): Record<string, any> {
   if (typesMap.has(type)) {
     return typesMap.get(type)!;
   }
@@ -352,6 +362,7 @@ function emitEnum(type: SdkEnumType): Record<string, any> {
     values,
     xmlMetadata: {},
     crossLanguageDefinitionId: type.crossLanguageDefinitionId,
+    clientNamespace: getClientNamespace(context, type.clientNamespace),
   };
   for (const value of type.values) {
     newValue.values.push(emitEnumMember(value, newValue));
@@ -469,6 +480,7 @@ function emitUnion<TServiceOperation extends SdkServiceOperation>(
     type: "combined",
     types: type.variantTypes.map((x) => getType(context, x)),
     xmlMetadata: {},
+    clientNamespace: getClientNamespace(context, type.clientNamespace),
   });
 }
 

packages/http-client-python/emitter/src/utils.ts

@@ -199,3 +199,30 @@ export function isAzureCoreErrorResponse(t: SdkType | undefined): boolean {
 export function capitalize(name: string): string {
   return name[0].toUpperCase() + name.slice(1);
 }
+
+export function getClientNamespace<TServiceOperation extends SdkServiceOperation>(
+  context: PythonSdkContext<TServiceOperation>,
+  clientNamespace: string,
+) {
+  const rootNamespace = removeUnderscoresFromNamespace(
+    context.sdkPackage.rootNamespace,
+  ).toLowerCase();
+  if ([undefined, false].includes(context.emitContext.options["enable-typespec-namespace"])) {
+    return rootNamespace;
+  }
+  if (
+    [
+      "azure.core",
+      "azure.resourcemanager",
+      "azure.clientgenerator.core",
+      "typespec.rest",
+      "typespec.http",
+      "typespec.versioning",
+    ].some((item) => clientNamespace.toLowerCase().startsWith(item))
+  ) {
+    return rootNamespace;
+  }
+  return clientNamespace === ""
+    ? rootNamespace
+    : removeUnderscoresFromNamespace(clientNamespace).toLowerCase();
+}

packages/http-client-python/eng/scripts/ci/regenerate.ts

@@ -122,6 +122,9 @@ const EMITTER_OPTIONS: Record<string, Record<string, string> | Record<string, st
   "client/structure/two-operation-group": {
     "package-name": "client-structure-twooperationgroup",
   },
+  "client/namespace": {
+    "enable-typespec-namespace": "true",
+  },
 };
 
 function toPosix(dir: string): string {

packages/http-client-python/generator/pygen/black.py

@@ -43,7 +43,7 @@ def process(self) -> bool:
                         "venv",
                         "env",
                     )
-                    and not Path(f).parts[0].startswith(".")
+                    and (not Path(f).parts[0].startswith(".") or Path(f).parts[0] == "..")
                     and Path(f).suffix == ".py"
                 ],
             )

packages/http-client-python/generator/pygen/codegen/__init__.py

@@ -40,6 +40,7 @@ class OptionsRetriever:
         "generate-test": False,
         "from-typespec": False,
         "emit-cross-language-definition-file": False,
+        "enable-typespec-namespace": False,
     }
 
     @property
@@ -244,7 +245,7 @@ def _validate_code_model_options(self) -> None:
     @staticmethod
     def sort_exceptions(yaml_data: Dict[str, Any]) -> None:
         for client in yaml_data["clients"]:
-            for group in client["operationGroups"]:
+            for group in client.get("operationGroups", []):
                 for operation in group["operations"]:
                     if not operation.get("exceptions"):
                         continue
@@ -261,7 +262,7 @@ def sort_exceptions(yaml_data: Dict[str, Any]) -> None:
     @staticmethod
     def remove_cloud_errors(yaml_data: Dict[str, Any]) -> None:
         for client in yaml_data["clients"]:
-            for group in client["operationGroups"]:
+            for group in client.get("operationGroups", []):
                 for operation in group["operations"]:
                     if not operation.get("exceptions"):
                         continue
@@ -316,6 +317,7 @@ def _build_code_model_options(self) -> Dict[str, Any]:
             "flavor",
             "company_name",
             "emit_cross_language_definition_file",
+            "enable_typespec_namespace",
         ]
         return {f: getattr(self.options_retriever, f) for f in flags}
 

packages/http-client-python/generator/pygen/codegen/_utils.py

@@ -15,3 +15,7 @@
 TYPESPEC_PACKAGE_MODE = ["azure-mgmt", "azure-dataplane", "generic"]
 VALID_PACKAGE_MODE = SWAGGER_PACKAGE_MODE + TYPESPEC_PACKAGE_MODE
 NAME_LENGTH_LIMIT = 40
+
+
+def get_parent_namespace(namespace: str) -> str:
+    return namespace.rsplit(".", 1)[0]

packages/http-client-python/generator/pygen/codegen/models/base.py

@@ -87,8 +87,7 @@ def xml_serialization_ctxt(self) -> Optional[str]:
             attrs_list.append("'text': True")
         return ", ".join(attrs_list)
 
-    @property
-    def serialization_type(self) -> str:
+    def serialization_type(self, **kwargs: Any) -> str:
         """The tag recognized by 'msrest' as a serialization/deserialization.
 
         'str', 'int', 'float', 'bool' or
@@ -103,7 +102,7 @@ def serialization_type(self) -> str:
 
     @property
     def msrest_deserialization_key(self) -> str:
-        return self.serialization_type
+        return self.serialization_type()
 
     @property
     def client_default_value(self) -> Any:

packages/http-client-python/generator/pygen/codegen/models/base_builder.py

@@ -72,6 +72,7 @@ def __init__(
         self.api_versions: List[str] = yaml_data["apiVersions"]
         self.added_on: Optional[str] = yaml_data.get("addedOn")
         self.external_docs: Optional[Dict[str, Any]] = yaml_data.get("externalDocs")
+        self.client_namespace: str = yaml_data.get("clientNamespace", code_model.namespace)
 
         if code_model.options["version_tolerant"] and yaml_data.get("abstract"):
             _LOGGER.warning(
@@ -112,7 +113,7 @@ def description(self) -> str:
             )
         return self._description or self.name
 
-    def method_signature(self, async_mode: bool) -> List[str]:
+    def method_signature(self, async_mode: bool, **kwargs: Any) -> List[str]:
         if self.abstract:
             return ["*args,", "**kwargs"]
-        return self.parameters.method_signature(async_mode)
+        return self.parameters.method_signature(async_mode, **kwargs)