Merge branch 'main' into ReleaseHttpSpecsAlpha4

microsoft · Dec 9, 2024 · d1f3dae · d1f3dae
2 parents a38a7d9 + 55f313e
commit d1f3dae
Show file tree

Hide file tree

Showing 5 changed files with 25 additions and 17 deletions.
diff --git a/packages/http-client-python/CHANGELOG.md b/packages/http-client-python/CHANGELOG.md
@@ -1,5 +1,12 @@
 # Change Log - @typespec/http-client-python
 
+## 0.4.2
+
+### Bug Fixes
+
+- Ignore models/enum only used as LRO envelope results
+- Refine exception handling logic to keep compatibility for legacy SDK
+
 ## 0.4.1
 
 ### Bug Fixes

diff --git a/packages/http-client-python/emitter/src/code-model.ts b/packages/http-client-python/emitter/src/code-model.ts
@@ -250,6 +250,16 @@ function emitClient<TServiceOperation extends SdkServiceOperation>(
   };
 }
 
+function onlyUsedByPolling(usage: UsageFlags): boolean {
+  return (
+    ((usage & UsageFlags.LroInitial) > 0 ||
+      (usage & UsageFlags.LroFinalEnvelope) > 0 ||
+      (usage & UsageFlags.LroPolling) > 0) &&
+    (usage & UsageFlags.Input) === 0 &&
+    (usage & UsageFlags.Output) === 0
+  );
+}
+
 export function emitCodeModel<TServiceOperation extends SdkServiceOperation>(
   sdkContext: PythonSdkContext<TServiceOperation>,
 ) {
@@ -269,9 +279,6 @@ export function emitCodeModel<TServiceOperation extends SdkServiceOperation>(
   }
   // loop through models and enums since there may be some orphaned models needs to be generated
   for (const model of sdkPackage.models) {
-    if (isAzureCoreModel(model)) {
-      continue;
-    }
     // filter out spread models
     if (
       model.name === "" ||
@@ -282,13 +289,7 @@ export function emitCodeModel<TServiceOperation extends SdkServiceOperation>(
       continue;
     }
     // filter out models only used for polling and or envelope result
-    if (
-      ((model.usage & UsageFlags.LroInitial) > 0 ||
-        (model.usage & UsageFlags.LroFinalEnvelope) > 0 ||
-        (model.usage & UsageFlags.LroPolling) > 0) &&
-      (model.usage & UsageFlags.Input) === 0 &&
-      (model.usage & UsageFlags.Output) === 0
-    ) {
+    if (onlyUsedByPolling(model.usage)) {
       continue;
     }
     // filter out specific models not used in python, e.g., pageable models
@@ -302,13 +303,13 @@ export function emitCodeModel<TServiceOperation extends SdkServiceOperation>(
     getType(sdkContext, model);
   }
   for (const sdkEnum of sdkPackage.enums) {
-    if (isAzureCoreModel(sdkEnum)) {
-      continue;
-    }
     // filter out api version enum since python do not generate it
     if (sdkEnum.usage === UsageFlags.ApiVersionEnum) {
       continue;
     }
+    if (onlyUsedByPolling(sdkEnum.usage)) {
+      continue;
+    }
     // filter out core enums
     if (isAzureCoreModel(sdkEnum)) {
       continue;

diff --git a/packages/http-client-python/generator/pygen/codegen/models/operation.py b/packages/http-client-python/generator/pygen/codegen/models/operation.py
@@ -202,7 +202,7 @@ def default_error_deserialization(self) -> Optional[str]:
         exception_schema = default_exceptions[0].type
         if isinstance(exception_schema, ModelType):
             return exception_schema.type_annotation(skip_quote=True)
-        return None
+        return None if self.code_model.options["models_mode"] == "dpg" else "'object'"
 
     @property
     def non_default_errors(self) -> List[Response]:

diff --git a/packages/http-client-python/package-lock.json b/packages/http-client-python/package-lock.json
diff --git a/packages/http-client-python/package.json b/packages/http-client-python/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@typespec/http-client-python",
-  "version": "0.4.1",
+  "version": "0.4.2",
   "author": "Microsoft Corporation",
   "description": "TypeSpec emitter for Python SDKs",
   "homepage": "https://typespec.io",