Annofab v0.199.0に対応しました (#705)

* update swagger

* update pydantic_models

* MyOrganizationのテストを追加

* update ruff

Author: yuji38kwmt

annofabapi/pydantic_models/my_organization.py

@@ -29,15 +29,15 @@ class MyOrganization(BaseModel):
     MyOrganization
     """
 
-    organization_id: Optional[StrictStr] = Field(default=None, description="組織ID。[値の制約についてはこちら。](#section/API-Convention/APIID) ")
-    name: Optional[StrictStr] = None
-    email: Optional[StrictStr] = None
-    price_plan: Optional[PricePlan] = None
-    summary: Optional[Dict[str, Any]] = Field(default=None, description="廃止予定のプロパティです。常に中身は空です。 ")
-    created_datetime: Optional[str] = Field(default=None, description="作成日時")
-    updated_datetime: Optional[str] = Field(default=None, description="更新日時")
-    my_role: Optional[OrganizationMemberRole] = None
-    my_status: Optional[OrganizationMemberStatus] = None
+    organization_id: StrictStr = Field(description="組織ID。[値の制約についてはこちら。](#section/API-Convention/APIID) ")
+    name: StrictStr
+    email: StrictStr
+    price_plan: PricePlan
+    summary: Dict[str, Any] = Field(description="廃止予定のプロパティです。常に中身は空です。 ")
+    created_datetime: str = Field(description="作成日時")
+    updated_datetime: str = Field(description="更新日時")
+    my_role: OrganizationMemberRole
+    my_status: OrganizationMemberStatus
     __properties: ClassVar[List[str]] = [
         "organization_id",
         "name",

annofabapi/pydantic_models/project_task_counts.py

@@ -27,7 +27,7 @@ class ProjectTaskCounts(BaseModel):
     ProjectTaskCounts
     """
 
-    task_counts: Optional[List[ProjectTaskCountsTaskCountsInner]] = None
+    task_counts: List[ProjectTaskCountsTaskCountsInner]
     __properties: ClassVar[List[str]] = ["task_counts"]
 
     model_config = ConfigDict(

annofabapi/pydantic_models/project_task_counts_task_counts_inner.py

@@ -28,9 +28,9 @@ class ProjectTaskCountsTaskCountsInner(BaseModel):
     ProjectTaskCountsTaskCountsInner
     """
 
-    phase: Optional[TaskPhase] = None
-    status: Optional[TaskStatus] = None
-    count: Optional[Union[StrictFloat, StrictInt]] = Field(default=None, description="該当するタスクの数")
+    phase: TaskPhase
+    status: TaskStatus
+    count: Union[StrictFloat, StrictInt] = Field(description="該当するタスクの数")
     __properties: ClassVar[List[str]] = ["phase", "status", "count"]
 
     model_config = ConfigDict(

generate/swagger/swagger-api-components.yaml

@@ -1325,6 +1325,16 @@ components:
         * `{projectId}`
     MyOrganization:
       type: object
+      required:
+        - organization_id
+        - name
+        - email
+        - price_plan
+        - summary
+        - created_datetime
+        - updated_datetime
+        - my_role
+        - my_status
       properties:
         organization_id:
           $ref: "#/components/schemas/OrganizationId"
@@ -7703,11 +7713,17 @@ components:
           example: "IllegalState"
     ProjectTaskCounts:
       type: object
+      required:
+        - task_counts
       properties:
         task_counts:
           type: array
           items:
             type: object
+            required:
+              - phase
+              - status
+              - count
             properties:
               phase:
                 $ref: "#/components/schemas/TaskPhase"

generate/swagger/swagger.v2.yaml

@@ -115,7 +115,7 @@ info:
 
     上記例 `account_id_count` は、タスクのフィールド `account_id` でタスクを分類したところ「`account_id` が `c5eee002` であるタスクが9件、`9f110e48` であるタスクが5件、`b25dfeb3` であるタスクが1件」だったという結果を表しています。
 
-  version: 0.197.2
+  version: 0.199.0
   title: Annofab Web API
   x-logo:
     url: "https://annofab.com/resource/images/logo_landscape.png"

generate/swagger/swagger.yaml

@@ -118,7 +118,7 @@ info:
     上記例 `account_id_count` は、タスクのフィールド `account_id` でタスクを分類したところ「`account_id` が `c5eee002` であるタスクが9件、`9f110e48` であるタスクが5件、`b25dfeb3` であるタスクが1件」だったという結果を表しています。
     また、AggregationResultの集約の件数は、合計で10000件以下に制限されており、それを超える件数がある場合は上位10000件が取得されます。もし、省略された部分を取得したい場合は、検索条件を縛って結果に上る集約の数を減らしてください。
 
-  version: 0.197.2
+  version: 0.199.0
   title: Annofab Web API
   x-logo:
     url: "https://annofab.com/resource/images/logo_landscape.png"

poetry.lock

@@ -4,6 +4,7 @@
 import annofabapi
 from annofabapi.pydantic_models.annotation_specs_v3 import AnnotationSpecsV3
 from annofabapi.pydantic_models.input_data import InputData
+from annofabapi.pydantic_models.my_organization import MyOrganization
 from annofabapi.pydantic_models.project import Project
 from annofabapi.pydantic_models.project_member import ProjectMember
 from annofabapi.pydantic_models.simple_annotation import SimpleAnnotation
@@ -67,3 +68,8 @@ def test__SimpleAnnotation():
     with open("tests/data/simple-annotation/sample_1/c86205d1-bdd4-4110-ae46-194e661d622b.json") as f:
         content = json.load(f)
     SimpleAnnotation.from_dict(content)
+
+
+def test__MyOrganization():
+    organizations, _ = service.api.get_my_organizations()
+    MyOrganization.from_dict(organizations["list"][0])