Skip to content

Commit 4b39089

Browse files
yuji38kwmtyuji38kwmt
authored
Merge pull request #126 from kurusugawa-computer/annofab-v0.72.1
Annofab v0.72.1対応
2 parents 72b319a + 830f245 commit 4b39089

File tree

7 files changed

+4
-287
lines changed

7 files changed

+4
-287
lines changed

‎annofabapi/__version__.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = '0.27.2'
1+
__version__ = '0.27.3'

‎annofabapi/dataclass/annotation.py

-38
Original file line numberDiff line numberDiff line change
@@ -107,37 +107,6 @@ class FullAnnotationDetail:
107107
""""""
108108

109109

110-
@dataclass_json
111-
@dataclass
112-
class FullAnnotationDetailOld:
113-
"""
114-
for v1
115-
"""
116-
annotation_id: Optional[str]
117-
"""アノテーションID。[値の制約についてはこちら。](#section/API-Convention/APIID)<br> annotation_type が classification の場合は label_id と同じ値が格納されます。 """
118-
119-
user_id: Optional[str]
120-
""""""
121-
122-
label_id: Optional[str]
123-
""""""
124-
125-
label_name: Optional[InternationalizationMessage]
126-
""""""
127-
128-
annotation_type: Optional[AnnotationType]
129-
""""""
130-
131-
data_holding_type: Optional[AnnotationDataHoldingType]
132-
""""""
133-
134-
data: Optional[FullAnnotationData]
135-
""""""
136-
137-
additional_data_list: Optional[List[AdditionalData]]
138-
""""""
139-
140-
141110
@dataclass_json
142111
@dataclass
143112
class FullAnnotation:
@@ -168,9 +137,6 @@ class FullAnnotation:
168137
details: Optional[List[FullAnnotationDetail]]
169138
""""""
170139

171-
detail: Optional[List[FullAnnotationDetailOld]]
172-
"""use details"""
173-
174140
updated_datetime: Optional[str]
175141
""""""
176142

@@ -329,10 +295,6 @@ class AnnotationDetail:
329295
additional_data_list: List[AdditionalData]
330296
"""各要素は、 [アノテーション仕様](#operation/getAnnotationSpecs)で定義された属性（`additional_data_definitions`内）のいずれかの要素と対応づけます。 各要素は、どの属性なのかを表す`additional_data_definition_id`、値が必要です。値は、属性の種類に対応するキーに格納します（下表）。 <table> <tr><th>アノテーション属性の種類<br>（`additional_data_definition`の`type`）</th><th>属性の値を格納するキー</th><th>データ型</th></tr> <tr><td>`comment` または `tracking`</td><td>`comment`</td><td>string</td></tr> <tr><td>`flag`</td><td>`flag`</td><td>boolean</td></tr> <tr><td>`integer`</td><td>`integer`</td><td>integer</td></tr> <tr><td>`choice` または `select`</td><td>`choice`</td><td>string（選択肢ID）</td></tr> <tr><td>`link`</td><td>`comment`</td><td>string（アノテーションID）</td></tr> </table> """
331297

332-
created_datetime: Optional[str]
333-
334-
updated_datetime: Optional[str]
335-
336298

337299
@dataclass_json
338300
@dataclass

‎annofabapi/models.py

-52
Original file line numberDiff line numberDiff line change
@@ -1398,8 +1398,6 @@ class AssigneeRuleOfResubmittedTask(Enum):
13981398
13991399
* details: List[FullAnnotationDetail]
14001400
1401-
* detail: List[FullAnnotationDetailOld]
1402-
use details
14031401
* updated_datetime: str
14041402
14051403
* annotation_format_version: str
@@ -1422,31 +1420,6 @@ class AssigneeRuleOfResubmittedTask(Enum):
14221420
* value: AdditionalDataValue
14231421
14241422
1425-
"""
1426-
1427-
FullAnnotationAdditionalDataOld = Dict[str, Any]
1428-
"""
1429-
for v1
1430-
1431-
Kyes of Dict
1432-
1433-
* additional_data_definition_id: str
1434-
1435-
* additional_data_definition_name: InternationalizationMessage
1436-
1437-
* type: AdditionalDataDefinitionType
1438-
1439-
* flag: bool
1440-
typeがflagの場合に、フラグのON(true)またはOFF(false)が格納される
1441-
* integer: int
1442-
typeがintegerの場合に、整数値が格納される
1443-
* comment: str
1444-
* typeがcommentの場合、コメントの値 * typeがtrackingの場合、トラッキングID * typeがlinkの場合、リンク先のアノテーションID
1445-
* choice: str
1446-
1447-
* choice_name: InternationalizationMessage
1448-
1449-
14501423
"""
14511424

14521425
FullAnnotationData = Dict[str, Any]
@@ -1605,31 +1578,6 @@ class AssigneeRuleOfResubmittedTask(Enum):
16051578
* additional_data_list: List[FullAnnotationAdditionalData]
16061579
16071580
1608-
"""
1609-
1610-
FullAnnotationDetailOld = Dict[str, Any]
1611-
"""
1612-
for v1
1613-
1614-
Kyes of Dict
1615-
1616-
* annotation_id: str
1617-
アノテーションID。[値の制約についてはこちら。](#section/API-Convention/APIID)<br> annotation_type が classification の場合は label_id と同じ値が格納されます。
1618-
* user_id: str
1619-
1620-
* label_id: str
1621-
1622-
* label_name: InternationalizationMessage
1623-
1624-
* annotation_type: AnnotationType
1625-
1626-
* data_holding_type: AnnotationDataHoldingType
1627-
1628-
* data: FullAnnotationData
1629-
1630-
* additional_data_list: List[AdditionalData]
1631-
1632-
16331581
"""
16341582

16351583

‎generate/generate.sh

+1-2
Original file line numberDiff line numberDiff line change
@@ -119,13 +119,12 @@ declare -a model_files=(${MODELS_DIR}/point.py \
119119
${MODELS_DIR}/additional_data.py \
120120
${MODELS_DIR}/full_annotation_additional_data.py \
121121
${MODELS_DIR}/full_annotation_detail.py \
122-
${MODELS_DIR}/full_annotation_detail_old.py \
123122
${MODELS_DIR}/full_annotation.py \
124123
${MODELS_DIR}/simple_annotation_detail.py \
125124
${MODELS_DIR}/simple_annotation.py \
126125
${MODELS_DIR}/single_annotation_detail.py \
127126
${MODELS_DIR}/single_annotation.py \
128-
${MODELS_DIR}/annotation_detail.py \
127+
${MODELS_DIR}/annotation_detail.
129128
${MODELS_DIR}/annotation.py \
130129
)
131130
cat partial-header/dataclass/common.py partial-header/dataclass/annotation.py \

‎generate/swagger/swagger-api-components.yaml

-64
Original file line numberDiff line numberDiff line change
@@ -3280,12 +3280,6 @@
32803280
type: array
32813281
items:
32823282
$ref: "#/components/schemas/FullAnnotationDetail"
3283-
detail:
3284-
deprecated: true
3285-
description: use details
3286-
type: array
3287-
items:
3288-
$ref: "#/components/schemas/FullAnnotationDetailOld"
32893283
updated_datetime:
32903284
type: string
32913285
format: date-time
@@ -3312,29 +3306,6 @@
33123306
type: array
33133307
items:
33143308
$ref: "#/components/schemas/FullAnnotationAdditionalData"
3315-
FullAnnotationDetailOld:
3316-
deprecated: true
3317-
description: for v1
3318-
type: object
3319-
properties:
3320-
annotation_id:
3321-
$ref: "#/components/schemas/AnnotationId"
3322-
user_id:
3323-
$ref: "#/components/schemas/UserId"
3324-
label_id:
3325-
$ref: "#/components/schemas/LabelId"
3326-
label_name:
3327-
$ref: "#/components/schemas/InternationalizationMessage"
3328-
annotation_type:
3329-
$ref: "#/components/schemas/AnnotationType"
3330-
data_holding_type:
3331-
$ref: "#/components/schemas/AnnotationDataHoldingType"
3332-
data:
3333-
$ref: "#/components/schemas/FullAnnotationData"
3334-
additional_data_list:
3335-
type: array
3336-
items:
3337-
$ref: "#/components/schemas/AdditionalData"
33383309
FullAnnotationData:
33393310
oneOf:
33403311
- type: object
@@ -3493,41 +3464,6 @@
34933464
$ref: "#/components/schemas/AdditionalDataDefinitionType"
34943465
value:
34953466
$ref: "#/components/schemas/AdditionalDataValue"
3496-
FullAnnotationAdditionalDataOld:
3497-
deprecated: true
3498-
description: for v1
3499-
type: object
3500-
properties:
3501-
additional_data_definition_id:
3502-
allOf:
3503-
- $ref: "#/components/schemas/AdditionalDataDefinitionId"
3504-
- description: 属性ID
3505-
additional_data_definition_name:
3506-
allOf:
3507-
- $ref: "#/components/schemas/InternationalizationMessage"
3508-
- description: 属性表示名
3509-
type:
3510-
$ref: "#/components/schemas/AdditionalDataDefinitionType"
3511-
flag:
3512-
type: boolean
3513-
description: typeがflagの場合に、フラグのON(true)またはOFF(false)が格納される
3514-
integer:
3515-
type: integer
3516-
description: typeがintegerの場合に、整数値が格納される
3517-
comment:
3518-
type: string
3519-
description: |
3520-
* typeがcommentの場合、コメントの値
3521-
* typeがtrackingの場合、トラッキングID
3522-
* typeがlinkの場合、リンク先のアノテーションID
3523-
choice:
3524-
allOf:
3525-
- $ref: "#/components/schemas/ChoiceId"
3526-
- description: typeがchoice・selectの場合に、選択肢のIDが格納される
3527-
choice_name:
3528-
allOf:
3529-
- $ref: "#/components/schemas/InternationalizationMessage"
3530-
- description: typeがchoice・selectの場合に、選択肢の表示名が格納される
35313467
BatchInspectionRequestItemPut:
35323468
type: object
35333469
description: 検査コメント更新

‎generate/swagger/swagger.v2.yaml

+1-65
Original file line numberDiff line numberDiff line change
@@ -76,7 +76,7 @@ info:
7676
WebhookID | プロジェクト内で一意
7777
入力データセットID | 組織内で一意
7878
79-
version: 0.72.0
79+
version: 0.72.1
8080
title: AnnoFab Web API
8181
x-logo:
8282
url: "https://annofab.com/images/logo_landscape.png"
@@ -3914,12 +3914,6 @@ components:
39143914
type: array
39153915
items:
39163916
$ref: "#/components/schemas/FullAnnotationDetail"
3917-
detail:
3918-
deprecated: true
3919-
description: use details
3920-
type: array
3921-
items:
3922-
$ref: "#/components/schemas/FullAnnotationDetailOld"
39233917
updated_datetime:
39243918
type: string
39253919
format: date-time
@@ -3946,29 +3940,6 @@ components:
39463940
type: array
39473941
items:
39483942
$ref: "#/components/schemas/FullAnnotationAdditionalData"
3949-
FullAnnotationDetailOld:
3950-
deprecated: true
3951-
description: for v1
3952-
type: object
3953-
properties:
3954-
annotation_id:
3955-
$ref: "#/components/schemas/AnnotationId"
3956-
user_id:
3957-
$ref: "#/components/schemas/UserId"
3958-
label_id:
3959-
$ref: "#/components/schemas/LabelId"
3960-
label_name:
3961-
$ref: "#/components/schemas/InternationalizationMessage"
3962-
annotation_type:
3963-
$ref: "#/components/schemas/AnnotationType"
3964-
data_holding_type:
3965-
$ref: "#/components/schemas/AnnotationDataHoldingType"
3966-
data:
3967-
$ref: "#/components/schemas/FullAnnotationData"
3968-
additional_data_list:
3969-
type: array
3970-
items:
3971-
$ref: "#/components/schemas/AdditionalData"
39723943
FullAnnotationData:
39733944
oneOf:
39743945
- type: object
@@ -4127,41 +4098,6 @@ components:
41274098
$ref: "#/components/schemas/AdditionalDataDefinitionType"
41284099
value:
41294100
$ref: "#/components/schemas/AdditionalDataValue"
4130-
FullAnnotationAdditionalDataOld:
4131-
deprecated: true
4132-
description: for v1
4133-
type: object
4134-
properties:
4135-
additional_data_definition_id:
4136-
allOf:
4137-
- $ref: "#/components/schemas/AdditionalDataDefinitionId"
4138-
- description: 属性ID
4139-
additional_data_definition_name:
4140-
allOf:
4141-
- $ref: "#/components/schemas/InternationalizationMessage"
4142-
- description: 属性表示名
4143-
type:
4144-
$ref: "#/components/schemas/AdditionalDataDefinitionType"
4145-
flag:
4146-
type: boolean
4147-
description: typeがflagの場合に、フラグのON(true)またはOFF(false)が格納される
4148-
integer:
4149-
type: integer
4150-
description: typeがintegerの場合に、整数値が格納される
4151-
comment:
4152-
type: string
4153-
description: |
4154-
* typeがcommentの場合、コメントの値
4155-
* typeがtrackingの場合、トラッキングID
4156-
* typeがlinkの場合、リンク先のアノテーションID
4157-
choice:
4158-
allOf:
4159-
- $ref: "#/components/schemas/ChoiceId"
4160-
- description: typeがchoice・selectの場合に、選択肢のIDが格納される
4161-
choice_name:
4162-
allOf:
4163-
- $ref: "#/components/schemas/InternationalizationMessage"
4164-
- description: typeがchoice・selectの場合に、選択肢の表示名が格納される
41654101
BatchInspectionRequestItemPut:
41664102
type: object
41674103
description: 検査コメント更新

0 commit comments

Comments
 (0)