niu/mdrs-client-python
7
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fixed type errors when pylance type checking mode is strict.

Browse Source
This commit is contained in:
Yoshihiro OKUMURA
2023-07-19 21:47:47 +09:00
parent 23025bd679
commit 08d8a0626a
24 changed files with 387 additions and 236 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
mdrsclient/api/file.py
View File

@ -1,4 +1,4 @@
from typing import Final
from typing import Any, Final
from pydantic import TypeAdapter
from pydantic.dataclasses import dataclass
@ -29,7 +29,7 @@ class FileApi(BaseApi):
# print(self.__class__.__name__ + "::" + sys._getframe().f_code.co_name)
url = self.ENTRYPOINT
token_check(self.connection)
data = {"folder_id": folder_id}
data: dict[str, str | int] = {"folder_id": folder_id}
try:
with open(path, mode="rb") as fp:
response = self.connection.post(url, data=data, files={"file": fp})
@ -52,7 +52,7 @@ class FileApi(BaseApi):
raise UnexpectedException(f"Could not open `{path}` file.")
else:
# update metadata
data = {"name": file.name, "description": file.description}
data: dict[str, str | int] = {"name": file.name, "description": file.description}
response = self.connection.put(url, data=data)
self._raise_response_error(response)
return True
@ -68,13 +68,13 @@ class FileApi(BaseApi):
def move(self, file: File, folder_id: str) -> bool:
# print(self.__class__.__name__ + "::" + sys._getframe().f_code.co_name)
url = self.ENTRYPOINT + file.id + "/move/"
data = {"folder": folder_id, "name": file.name}
data: dict[str, str | int] = {"folder": folder_id, "name": file.name}
token_check(self.connection)
response = self.connection.post(url, data=data)
self._raise_response_error(response)
return True
def metadata(self, file: File) -> dict:
def metadata(self, file: File) -> dict[str, Any]:
# print(self.__class__.__name__ + "::" + sys._getframe().f_code.co_name)
url = self.ENTRYPOINT + file.id + "/metadata/"
token_check(self.connection)

18
mdrsclient/api/folder.py
View File

@ -1,4 +1,4 @@
from typing import Final
from typing import Any, Final
import requests
from pydantic import TypeAdapter
@ -21,7 +21,7 @@ class FolderApi(BaseApi):
def list(self, laboratory_id: int, path: str) -> list[FolderSimple]:
# print(self.__class__.__name__ + "::" + sys._getframe().f_code.co_name)
url = self.ENTRYPOINT
params = {"path": path, "laboratory_id": laboratory_id}
params: dict[str, str | int] = {"path": path, "laboratory_id": laboratory_id}
token_check(self.connection)
response = self.connection.get(url, params=params)
self._raise_response_error(response)
@ -42,7 +42,7 @@ class FolderApi(BaseApi):
def create(self, name: str, parent_id: str) -> str:
# print(self.__class__.__name__ + "::" + sys._getframe().f_code.co_name)
url = self.ENTRYPOINT
data = {"name": name, "parent_id": parent_id, "description": "", "template_id": -1}
data: dict[str, str | int] = {"name": name, "parent_id": parent_id, "description": "", "template_id": -1}
token_check(self.connection)
response = self.connection.post(url, data=data)
self._raise_response_error(response)
@ -52,7 +52,7 @@ class FolderApi(BaseApi):
def update(self, folder: FolderSimple) -> bool:
# print(self.__class__.__name__ + "::" + sys._getframe().f_code.co_name)
url = self.ENTRYPOINT + folder.id + "/"
data = {
data: dict[str, str | int] = {
"name": folder.name,
"description": folder.description,
}
@ -64,7 +64,7 @@ class FolderApi(BaseApi):
def destroy(self, id: str, recursive: bool) -> bool:
# print(self.__class__.__name__ + "::" + sys._getframe().f_code.co_name)
url = self.ENTRYPOINT + id + "/"
params = {"recursive": recursive}
params: dict[str, str | int] = {"recursive": str(recursive)}
token_check(self.connection)
response = self.connection.delete(url, params=params)
self._raise_response_error(response)
@ -73,7 +73,7 @@ class FolderApi(BaseApi):
def auth(self, id: str, password: str) -> bool:
# print(self.__class__.__name__ + "::" + sys._getframe().f_code.co_name)
url = self.ENTRYPOINT + id + "/auth/"
data = {"password": password}
data: dict[str, str | int] = {"password": password}
token_check(self.connection)
response = self.connection.post(url, data=data)
if response.status_code == requests.codes.unauthorized:
@ -84,7 +84,7 @@ class FolderApi(BaseApi):
def acl(self, id: str, access_level: int, recursive: bool, password: str | None) -> bool:
# print(self.__class__.__name__ + "::" + sys._getframe().f_code.co_name)
url = self.ENTRYPOINT + id + "/acl/"
data: dict[str, int | str] = {"access_level": access_level}
data: dict[str, str | int] = {"access_level": access_level}
if password is not None:
data.update({"password": password})
if recursive is True:
@ -97,13 +97,13 @@ class FolderApi(BaseApi):
def move(self, folder: FolderSimple, folder_id: str) -> bool:
# print(self.__class__.__name__ + "::" + sys._getframe().f_code.co_name)
url = self.ENTRYPOINT + folder.id + "/move/"
data = {"parent": folder_id}
data: dict[str, str | int] = {"parent": folder_id}
token_check(self.connection)
response = self.connection.post(url, data=data)
self._raise_response_error(response)
return True
def metadata(self, id: str) -> dict:
def metadata(self, id: str) -> dict[str, Any]:
# print(self.__class__.__name__ + "::" + sys._getframe().f_code.co_name)
url = self.ENTRYPOINT + id + "/metadata/"
token_check(self.connection)

4
mdrsclient/api/user.py
View File

@ -22,7 +22,7 @@ class UserApi(BaseApi):
def auth(self, username: str, password: str) -> tuple[User, Token]:
# print(self.__class__.__name__ + "::" + sys._getframe().f_code.co_name)
url = self.ENTRYPOINT + "auth/"
data = {"username": username, "password": password}
data: dict[str, str | int] = {"username": username, "password": password}
response = self.connection.post(url, data=data)
if response.status_code == requests.codes.unauthorized:
raise UnauthorizedException("Invalid username or password.")
@ -37,7 +37,7 @@ class UserApi(BaseApi):
def refresh(self, token: Token) -> Token:
# print(self.__class__.__name__ + "::" + sys._getframe().f_code.co_name)
url = self.ENTRYPOINT + "refresh/"
data = {"refresh": token.refresh}
data: dict[str, str | int] = {"refresh": token.refresh}
response = self.connection.post(url, data=data)
if response.status_code == requests.codes.unauthorized:
raise UnauthorizedException("Token is invalid or expired.")