improve

vdusek · vdusek · commit b30691317aba · 2026-04-27T15:36:53.000+02:00
diff --git a/docs/02_concepts/code/03_nested_async.py b/docs/02_concepts/code/03_nested_async.py
@@ -1,5 +1,4 @@
 from apify_client import ApifyClientAsync
-from apify_client._literals_generated import ActorJobStatus
 
 TOKEN = 'MY-APIFY-TOKEN'
 
@@ -14,7 +13,7 @@ async def main() -> None:
     actor_runs = (await runs_client.list(limit=10, desc=True)).items
 
     # Select the last run of the Actor that finished with a SUCCEEDED status.
-    last_succeeded_run_client = actor_client.last_run(status=ActorJobStatus.SUCCEEDED)
+    last_succeeded_run_client = actor_client.last_run(status='SUCCEEDED')
 
     # Get dataset
     actor_run_dataset_client = last_succeeded_run_client.dataset()
diff --git a/docs/02_concepts/code/03_nested_sync.py b/docs/02_concepts/code/03_nested_sync.py
@@ -1,5 +1,4 @@
 from apify_client import ApifyClient
-from apify_client._literals_generated import ActorJobStatus
 
 TOKEN = 'MY-APIFY-TOKEN'
 
@@ -14,7 +13,7 @@ def main() -> None:
     actor_runs = runs_client.list(limit=10, desc=True).items
 
     # Select the last run of the Actor that finished with a SUCCEEDED status.
-    last_succeeded_run_client = actor_client.last_run(status=ActorJobStatus.SUCCEEDED)
+    last_succeeded_run_client = actor_client.last_run(status='SUCCEEDED')
 
     # Get dataset
     actor_run_dataset_client = last_succeeded_run_client.dataset()
diff --git a/scripts/postprocess_generated_models.py b/scripts/postprocess_generated_models.py
@@ -81,6 +81,11 @@ def _ensure_typing_import(content: str, name: str) -> str:
     )
 
 
+def _base_names(node: ast.ClassDef) -> set[str]:
+    """Return the set of unsubscripted base-class names of `node`."""
+    return {b.id for b in node.bases if isinstance(b, ast.Name)}
+
+
 def fix_discriminators(content: str) -> str:
     """Replace camelCase discriminator values with their snake_case equivalents."""
     for camel, snake in DISCRIMINATOR_FIXES.items():
@@ -93,15 +98,27 @@ def fix_discriminators(content: str) -> str:
 
 
 def deduplicate_error_type_enum(content: str) -> str:
-    """Remove the duplicate `Type` enum and rewire references to `ErrorType`."""
-    # Remove the entire `class Type(StrEnum): ...` block up to the next class definition.
-    content = re.sub(
-        r'\nclass Type\(StrEnum\):.*?(?=\nclass )',
-        '\n',
-        content,
-        flags=re.DOTALL,
+    """Remove the duplicate `Type` enum and rewire references to `ErrorType`.
+
+    The `type` property on `ErrorResponse` discriminator subtypes (`RunFailedErrorDetail` etc.)
+    re-emits the value list of the named `ErrorType` enum as a separate `class Type(StrEnum)` —
+    upstream issue https://github.com/koxudaxi/datamodel-code-generator/issues/3104.
+    """
+    tree = ast.parse(content)
+    type_node = next(
+        (n for n in tree.body if isinstance(n, ast.ClassDef) and n.name == 'Type' and 'StrEnum' in _base_names(n)),
+        None,
     )
-    # Replace standalone `Type` references in annotation contexts (`: Type`, `| Type`, `[Type`).
+    if type_node is None:
+        return content
+
+    assert type_node.end_lineno is not None  # noqa: S101
+    lines = content.split('\n')
+    del lines[type_node.lineno - 1 : type_node.end_lineno]
+    content = '\n'.join(lines)
+
+    # Lookbehinds are deliberately narrow: matching bare `\bType\b` would also rewrite `Type` in
+    # docstrings (`Content-Type`, `Type of event`), which broke an earlier version.
     content = re.sub(r'(?<=: )Type\b|(?<=\| )Type\b|(?<=\[)Type\b', 'ErrorType', content)
     return _collapse_blank_lines(content)
 
@@ -124,7 +141,7 @@ def convert_enums_to_literals(content: str) -> str:
     for node in tree.body:
         if not isinstance(node, ast.ClassDef):
             continue
-        base_names = {b.id for b in node.bases if isinstance(b, ast.Name)}
+        base_names = _base_names(node)
         if 'StrEnum' not in base_names:
             continue
 
@@ -340,7 +357,7 @@ def flatten_empty_typeddicts(content: str) -> str:
         if has_fields:
             continue
         # Only flatten TypedDict-based classes (e.g. skip Enum subclasses).
-        base_names = {b.id for b in node.bases if isinstance(b, ast.Name)}
+        base_names = _base_names(node)
         if 'TypedDict' not in base_names:
             continue
         assert node.end_lineno is not None  # noqa: S101
diff --git a/tests/unit/test_postprocess_generated_models.py b/tests/unit/test_postprocess_generated_models.py
