@typespec/http-client-python 0.5.0 → 0.6.0

package/emitter/src/emitter.ts

@@ -57,6 +57,9 @@ function addDefaultOptions(sdkContext: SdkContext) {
   if (!options.flavor && sdkContext.emitContext.emitterOutputDir.includes("azure")) {
     options.flavor = "azure";
   }
+  if (options["enable-typespec-namespace"] === undefined) {
+    options["enable-typespec-namespace"] = options.flavor !== "azure";
+  }
 }
 
 async function createPythonSdkContext<TServiceOperation extends SdkServiceOperation>(
@@ -79,6 +82,7 @@ export async function $onEmit(context: EmitContext<PythonEmitterOptions>) {
   const sdkContext = await createPythonSdkContext<SdkHttpOperation>(context);
   const root = path.join(dirname(fileURLToPath(import.meta.url)), "..", "..");
   const outputDir = context.emitterOutputDir;
+  addDefaultOptions(sdkContext);
   const yamlMap = emitCodeModel(sdkContext);
   if (yamlMap.clients.length === 0) {
     reportDiagnostic(program, {
@@ -88,7 +92,6 @@ export async function $onEmit(context: EmitContext<PythonEmitterOptions>) {
     return;
   }
   const yamlPath = await saveCodeModelAsYaml("python-yaml-path", yamlMap);
-  addDefaultOptions(sdkContext);
   const resolvedOptions = sdkContext.emitContext.options;
   const commandArgs: Record<string, string> = {};
   if (resolvedOptions["packaging-files-config"]) {
@@ -186,15 +189,38 @@ async function setupPyodideCall(root: string) {
   const pyodide = await loadPyodide({
     indexURL: path.dirname(fileURLToPath(import.meta.resolve("pyodide"))),
   });
-  // mount generator to pyodide
-  pyodide.FS.mkdirTree("/generator");
-  pyodide.FS.mount(
-    pyodide.FS.filesystems.NODEFS,
-    { root: path.join(root, "generator") },
-    "/generator",
-  );
-  await pyodide.loadPackage("micropip");
-  const micropip = pyodide.pyimport("micropip");
-  await micropip.install("emfs:/generator/dist/pygen-0.1.0-py3-none-any.whl");
+  const micropipLockPath = path.join(root, "micropip.lock");
+  while (true) {
+    if (fs.existsSync(micropipLockPath)) {
+      try {
+        const stats = fs.statSync(micropipLockPath);
+        const now = new Date().getTime();
+        const lockAge = (now - stats.mtime.getTime()) / 1000;
+        if (lockAge > 300) {
+          fs.unlinkSync(micropipLockPath);
+        }
+      } catch (err) {
+        // ignore
+      }
+    }
+    try {
+      const fd = fs.openSync(micropipLockPath, "wx");
+      // mount generator to pyodide
+      pyodide.FS.mkdirTree("/generator");
+      pyodide.FS.mount(
+        pyodide.FS.filesystems.NODEFS,
+        { root: path.join(root, "generator") },
+        "/generator",
+      );
+      await pyodide.loadPackage("micropip");
+      const micropip = pyodide.pyimport("micropip");
+      await micropip.install("emfs:/generator/dist/pygen-0.1.0-py3-none-any.whl");
+      fs.closeSync(fd);
+      fs.unlinkSync(micropipLockPath);
+      break;
+    } catch (err) {
+      await new Promise((resolve) => setTimeout(resolve, 1000));
+    }
+  }
   return pyodide;
 }

package/emitter/src/http.ts

@@ -204,7 +204,7 @@ function emitHttpOperation(
     apiVersions: [],
     wantTracing: true,
     exposeStreamKeyword: true,
-    crossLanguageDefinitionId: method?.crossLanguageDefintionId,
+    crossLanguageDefinitionId: method?.crossLanguageDefinitionId,
     samples: arrayToRecord(method?.operation.examples),
     internal: method.access === "internal",
   };

package/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: [],

package/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),
   });
 }
 

package/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 (!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();
+}