✨ reduce rest api webhook schemas

Author: yanyongyu

codegen/__init__.py

@@ -1,6 +1,6 @@
 import shutil
 from pathlib import Path
-from typing import Any, Dict, Union, Optional
+from typing import Any, Dict
 
 import httpx
 import tomli
@@ -116,6 +116,15 @@ def build_webhook(data: WebhookData, config: Config):
     logger.info("Successfully generated webhook codes!")
 
 
+def _patch_openapi_spec(spec: Dict[str, Any]):
+    spec.pop("webhooks", None)
+    for name in list(spec["components"]["schemas"].keys()):
+        if name.startswith("webhook-config"):
+            continue
+        elif name.startswith("webhook"):
+            del spec["components"]["schemas"][name]
+
+
 def build():
     config = load_config()
     logger.info(f"Loaded config: {config!r}")
@@ -125,6 +134,7 @@ def build():
     logger.info(f"Getting schema from {source.uri} succeeded!")
 
     logger.info("Start parsing OpenAPI spec...")
+    _patch_openapi_spec(source.root)
     parsed_data = parse_openapi_spec(source, config)
     logger.info(
         "Successfully parsed OpenAPI spec: "

codegen/parser/schemas/model_schema.py

@@ -121,7 +121,7 @@ def _is_model_merge(
                 # try merge
                 try:
                     prop = _merge_property(
-                        source,
+                        source / "allof" / "merged" / name,
                         properties[prop.name],
                         prop,
                         concat_snake_name(class_name, "prop", prop.name),
@@ -169,7 +169,7 @@ def _merge_schema(
         or _is_list_merge(source, name, prefix, first, second)
     ):
         return schema
-    raise RuntimeError(f"Cannot merge schema {first!r} {second!r}")
+    raise RuntimeError(f"Cannot merge schema for {name}: {first!r}; {second!r}")
 
 
 def _merge_property(

githubkit/rest/migrations.py

@@ -387,6 +387,7 @@ def get_import_status(
             response_model=Import,
             error_models={
                 "404": BasicError,
+                "503": BasicError,
             },
         )
 
@@ -403,6 +404,7 @@ async def async_get_import_status(
             response_model=Import,
             error_models={
                 "404": BasicError,
+                "503": BasicError,
             },
         )
 
@@ -452,6 +454,7 @@ def start_import(
             error_models={
                 "422": ValidationError,
                 "404": BasicError,
+                "503": BasicError,
             },
         )
 
@@ -501,6 +504,7 @@ async def async_start_import(
             error_models={
                 "422": ValidationError,
                 "404": BasicError,
+                "503": BasicError,
             },
         )
 
@@ -514,6 +518,9 @@ def cancel_import(
         return self._github.request(
             "DELETE",
             url,
+            error_models={
+                "503": BasicError,
+            },
         )
 
     async def async_cancel_import(
@@ -526,6 +533,9 @@ async def async_cancel_import(
         return await self._github.arequest(
             "DELETE",
             url,
+            error_models={
+                "503": BasicError,
+            },
         )
 
     @overload
@@ -574,6 +584,9 @@ def update_import(
             url,
             json=exclude_unset(json),
             response_model=Import,
+            error_models={
+                "503": BasicError,
+            },
         )
 
     @overload
@@ -622,6 +635,9 @@ async def async_update_import(
             url,
             json=exclude_unset(json),
             response_model=Import,
+            error_models={
+                "503": BasicError,
+            },
         )
 
     def get_commit_authors(
@@ -643,6 +659,7 @@ def get_commit_authors(
             response_model=List[PorterAuthor],
             error_models={
                 "404": BasicError,
+                "503": BasicError,
             },
         )
 
@@ -665,6 +682,7 @@ async def async_get_commit_authors(
             response_model=List[PorterAuthor],
             error_models={
                 "404": BasicError,
+                "503": BasicError,
             },
         )
 
@@ -718,6 +736,7 @@ def map_commit_author(
             error_models={
                 "422": ValidationError,
                 "404": BasicError,
+                "503": BasicError,
             },
         )
 
@@ -771,6 +790,7 @@ async def async_map_commit_author(
             error_models={
                 "422": ValidationError,
                 "404": BasicError,
+                "503": BasicError,
             },
         )
 
@@ -785,6 +805,9 @@ def get_large_files(
             "GET",
             url,
             response_model=List[PorterLargeFile],
+            error_models={
+                "503": BasicError,
+            },
         )
 
     async def async_get_large_files(
@@ -798,6 +821,9 @@ async def async_get_large_files(
             "GET",
             url,
             response_model=List[PorterLargeFile],
+            error_models={
+                "503": BasicError,
+            },
         )
 
     @overload
@@ -841,6 +867,7 @@ def set_lfs_preference(
             response_model=Import,
             error_models={
                 "422": ValidationError,
+                "503": BasicError,
             },
         )
 
@@ -885,6 +912,7 @@ async def async_set_lfs_preference(
             response_model=Import,
             error_models={
                 "422": ValidationError,
+                "503": BasicError,
             },
         )