Skip to content

Commit

Permalink
poetry update (#552)
Browse files Browse the repository at this point in the history
* poetry update

* format: black

* poetry update

* pylint 修正

* poetry update
  • Loading branch information
yuji38kwmt committed Feb 20, 2023
1 parent 89f3522 commit b4598b3
Show file tree
Hide file tree
Showing 5 changed files with 141 additions and 134 deletions.
1 change: 0 additions & 1 deletion annofabapi/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -231,7 +231,6 @@ class AnnofabApi(AbstractAnnofabApi):
"""

def __init__(self, login_user_id: str, login_password: str, endpoint_url: str = DEFAULT_ENDPOINT_URL):

if not login_user_id or not login_password:
raise ValueError("login_user_id or login_password is empty.")

Expand Down
1 change: 0 additions & 1 deletion annofabapi/api2.py
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,6 @@ def _request_wrapper(

# CloudFrontから403 Errorが発生したとき
if response.status_code == requests.codes.forbidden and response.headers.get("server") == "CloudFront":

self._get_signed_access_v2(url_path)
return self._request_wrapper(
http_method,
Expand Down
43 changes: 21 additions & 22 deletions annofabapi/wrapper.py
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,6 @@ def __to_dest_annotation_detail(
dest_detail = detail
dest_detail["account_id"] = account_id
if detail["data_holding_type"] == AnnotationDataHoldingType.OUTER.value:

try:
outer_file_url = detail["url"]
src_response = self.api._execute_http_request("get", outer_file_url)
Expand Down Expand Up @@ -555,13 +554,13 @@ def __to_additional_data_list(self, attributes: Dict[str, Any], label_info: Labe
)
continue

additional_data = dict(
additional_data_definition_id=specs_additional_data["additional_data_definition_id"],
flag=None,
integer=None,
choice=None,
comment=None,
)
additional_data = {
"additional_data_definition_id": specs_additional_data["additional_data_definition_id"],
"flag": None,
"integer": None,
"choice": None,
"comment": None,
}
additional_data_type = specs_additional_data["type"]
if additional_data_type == AdditionalDataDefinitionType.FLAG.value:
additional_data["flag"] = value
Expand Down Expand Up @@ -620,20 +619,20 @@ def __to_annotation_detail_for_request(
additional_data_list: List[AdditionalDataV1] = self.__to_additional_data_list(detail["attributes"], label_info)
data_holding_type = self.__get_data_holding_type_from_data(detail["data"])

dest_obj = dict(
label_id=label_info["label_id"],
annotation_id=detail["annotation_id"] if detail.get("annotation_id") is not None else str(uuid.uuid4()),
account_id=self.api.account_id,
data_holding_type=data_holding_type,
data=detail["data"],
additional_data_list=additional_data_list,
is_protected=False,
etag=None,
url=None,
path=None,
created_datetime=None,
updated_datetime=None,
)
dest_obj = {
"label_id": label_info["label_id"],
"annotation_id": detail["annotation_id"] if detail.get("annotation_id") is not None else str(uuid.uuid4()),
"account_id": self.api.account_id,
"data_holding_type": data_holding_type,
"data": detail["data"],
"additional_data_list": additional_data_list,
"is_protected": False,
"etag": None,
"url": None,
"path": None,
"created_datetime": None,
"updated_datetime": None,
}

if data_holding_type == AnnotationDataHoldingType.OUTER.value:
data_uri = detail["data"]["data_uri"]
Expand Down

0 comments on commit b4598b3

Please sign in to comment.