api: fix models to match swagger schema

altrepo/api/methods.py

@@ -174,11 +174,11 @@ class TaskInfo:
 
     async def build_dependency_set(
         self, task_id: int, arch: str = "x86_64"
-    ) -> models.BuildDependencySetModel:
+    ) -> models.TaskBuildDependencySetModel:
         data = await self.client.get(
             f"/task/build_dependency_set/{task_id}", {"arch": arch}
         )
-        return models.BuildDependencySetModel(**data)
+        return models.TaskBuildDependencySetModel(**data)
 
     async def check_images(self, payload: dict) -> models.CheckImagesOutputModel:
         data = await self.client.post("/task/check_images", json=payload)
@@ -1313,12 +1313,12 @@ class DependenciesInfo:
         name: str,
         branch: str,
         dp_type: Literal["both", "source", "binary"] = "both",
-    ) -> models.PackageBuildDependencyModel:
+    ) -> models.DependsPackageBuildDependencyModel:
         data = await self.client.get(
             "/dependencies/what_depends_src",
             {"name": name, "branch": branch, "dp_type": dp_type},
         )
-        return models.PackageBuildDependencyModel(**data)
+        return models.DependsPackageBuildDependencyModel(**data)
 
 
 class ErrataInfo:

altrepo/api/models.py

@@ -167,6 +167,7 @@ class BugzillaInfoElementModel(BaseModel):
     component: str
     source_package_name: str
     binary_package_name: str
+    assignee: str | None = None
     reporter: str
     summary: str
     last_changed: str
@@ -551,12 +552,19 @@ class PackageDependsModel(BaseModel):
 
 
 class PackageBuildDependencyElementModel(BaseModel):
-    pkghash: str
+    depth: int
     name: str
+    version: str
+    release: str
+    epoch: int
+    serial: int
+    sourcerpm: str
     branch: str
     buildtime: str
+    archs: List[str]
+    cycle: List[str]
+    requires: List[str]
     acl: List[str]
-    depends: List[PackageDependsModel]
 
 
 class PackageBuildDependencyModel(BaseModel):
@@ -565,6 +573,21 @@ class PackageBuildDependencyModel(BaseModel):
     dependencies: List[PackageBuildDependencyElementModel]
 
 
+class DependsPackageBuildDependencyElementModel(BaseModel):
+    pkghash: str
+    name: str
+    branch: str
+    buildtime: str
+    acl: List[str]
+    depends: List[PackageDependsModel]
+
+
+class DependsPackageBuildDependencyModel(BaseModel):
+    request_args: Dict[str, Any]
+    length: int
+    dependencies: List[DependsPackageBuildDependencyElementModel]
+
+
 class AdvisoryErrataReferenceModel(BaseModel):
     type: str
     link: str
@@ -644,7 +667,7 @@ class ErrataVulnerabilityModel(BaseModel):
     published_date: str
     body: str
     is_valid: bool
-    parsed: Dict[str, Any] | None
+    parsed: "VulnerabilityParsedDetailsModel | None"
 
 
 class ErrataPackageUpdateModel(BaseModel):
@@ -1019,20 +1042,20 @@ class ImageJSONElementModel(BaseModel):
     img_edition: str
     img_name: str
     img_show: str
-    img_summary_ru: str
-    img_summary_en: str
+    img_summary_ru: str | None = None
+    img_summary_en: str | None = None
     img_start_date: str
     img_end_date: str
-    img_mailing_list: str
-    img_name_bugzilla: str
+    img_mailing_list: str | None = None
+    img_name_bugzilla: str | None = None
     img_json: Dict[str, Any]
 
 
 class ImageJSONModel(BaseModel):
     img_branch: str
-    img_description_ru: str
-    img_description_en: str
-    images: List[ImageJSONElementModel]
+    img_description_ru: str | None = None
+    img_description_en: str | None = None
+    images: List[ImageJSONElementModel] | None = None
 
 
 class ImageTagStatusGetElementModel(BaseModel):
@@ -1309,6 +1332,28 @@ class BuildDependencySetModel(BaseModel):
     ambiguous_dependencies: List[BuildDependencySetAmbiguousProvidesModel]
 
 
+class TaskBuildDependencySetPackageModel(BaseModel):
+    name: str
+    version: str
+    release: str
+    epoch: int
+    archs: List[str]
+
+
+class TaskBuildDependencySetPackagesModel(BaseModel):
+    package: str
+    length: int
+    depends: List[TaskBuildDependencySetPackageModel]
+
+
+class TaskBuildDependencySetModel(BaseModel):
+    id: int
+    request_args: Dict[str, Any]
+    length: int
+    packages: List[TaskBuildDependencySetPackagesModel]
+    ambiguous_dependencies: List[BuildDependencySetAmbiguousProvidesModel]
+
+
 class PackageFindPackagesetElementModel(BaseModel):
     branch: str
     pkgset_datetime: str
@@ -1539,7 +1584,7 @@ class PackageSetStatusPostElementModel(BaseModel):
     rs_description_ru: str
     rs_description_en: str
     rs_mailing_list: str
-    rs_mirrors_json: List[Dict[str, Any]]
+    rs_mirrors_json: List[Dict[str, Any]] | None = None
 
 
 class PackageSetStatusPostModel(BaseModel):
@@ -1624,6 +1669,13 @@ class SitePackageVersionsElementModel(BaseModel):
     branch: str
     version: str
     release: str
+    pkghash: str | None = None
+
+
+class SitePackagesetPackageVersionsElementModel(BaseModel):
+    branch: str
+    version: str
+    release: str
     pkghash: str
     deleted: bool
 
@@ -1692,7 +1744,7 @@ class SiteFingPackagesPackageModel(BaseModel):
     url: str
     summary: str
     category: str
-    versions: List[SitePackageVersionsElementModel]
+    versions: List[SitePackagesetPackageVersionsElementModel]
     by_binary: bool
 
 
@@ -2354,10 +2406,10 @@ class VulnerabilityCVSSVectorElementModel(BaseModel):
 
 class VulnerabilityConfigurationElementModel(BaseModel):
     cpe: str
-    version_start_excluding: str
-    version_start_including: str
-    version_end_excluding: str
-    version_end_including: str
+    version_start_excluding: str | None = None
+    version_start_including: str | None = None
+    version_end_excluding: str | None = None
+    version_end_including: str | None = None
 
 
 class VulnerabilityParsedDetailsModel(BaseModel):
@@ -2433,3 +2485,6 @@ class CveTaskPackagesElementModel(BaseModel):
 
 class CveVulnerableTaskModel(BaseModel):
     packages: List[CveTaskPackagesElementModel]
+
+
+ErrataVulnerabilityModel.model_rebuild()