Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,8 @@ lint:
poetry run pylint --jobs=0 annofabapi tests/create_test_project.py

test:
poetry run pytest -n auto --cov=annofabapi --cov-report=html tests
# 並列で実行するとエラーになるので、シーケンシャルで実行する
poetry run pytest --cov=annofabapi --cov-report=html tests

publish:
poetry publish --build
Expand Down
2 changes: 1 addition & 1 deletion annofabapi/__version__.py
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = "0.46.5"
__version__ = "0.47.0"
14 changes: 9 additions & 5 deletions annofabapi/api.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,10 @@ class AnnofabApi(AbstractAnnofabApi):
login_user_id: AnnoFabにログインするときのユーザID
login_password: AnnoFabにログインするときのパスワード
endpoint_url: AnnoFab APIのエンドポイント。

Attributes:
token_dict: login, refresh_tokenで取得したtoken情報
cookies: Signed Cookie情報
"""

def __init__(self, login_user_id: str, login_password: str, endpoint_url: str = DEFAULT_ENDPOINT_URL):
Expand All @@ -90,13 +94,13 @@ def __init__(self, login_user_id: str, login_password: str, endpoint_url: str =
self.url_prefix = f"{endpoint_url}/api/v1"
self.session = requests.Session()

#: login, refresh_tokenで取得したtoken情報
token_dict: Optional[Dict[str, Any]] = None
#: login, refresh_tokenで取得したtoken情報
self.token_dict: Optional[Dict[str, Any]] = None

#: Signed Cookie情報
cookies: Optional[RequestsCookieJar] = None
#: Signed Cookie情報
self.cookies: Optional[RequestsCookieJar] = None

__account_id: Optional[str] = None
self.__account_id: Optional[str] = None

class __MyToken(AuthBase):
"""
Expand Down
Loading