Skip to content

Fix: aiohttp issues a DeprecationWarning #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 19, 2024
Merged

Fix: aiohttp issues a DeprecationWarning #129

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
29f2b31
Fix: aiohttp issues a DeprecationWarning
hoh Jun 14, 2024
978910d
fix(authenticated_http/storage_push_file): fix and add type annotation
Psycojoker Jun 19, 2024
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
11 changes: 6 additions & 5 deletions src/aleph/sdk/client/authenticated_http.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@
import logging
import ssl
import time
from io import BytesIO
from pathlib import Path
from typing import Any, Dict, List, Mapping, NoReturn, Optional, Tuple, Union

Expand Down Expand Up @@ -114,14 +115,14 @@ async def storage_push(self, content: Mapping) -> str:
resp.raise_for_status()
return (await resp.json()).get("hash")

async def ipfs_push_file(self, file_content: Union[str, bytes]) -> str:
async def ipfs_push_file(self, file_content: bytes) -> str:
"""
Push a file to the IPFS service.

:param file_content: The file content to upload
"""
data = aiohttp.FormData()
data.add_field("file", file_content)
data.add_field("file", BytesIO(file_content))

url = "/api/v0/ipfs/add_file"
logger.debug(f"Pushing file to IPFS on {url}")
Expand All @@ -130,12 +131,12 @@ async def ipfs_push_file(self, file_content: Union[str, bytes]) -> str:
resp.raise_for_status()
return (await resp.json()).get("hash")

async def storage_push_file(self, file_content) -> str:
async def storage_push_file(self, file_content: bytes) -> Optional[str]:
"""
Push a file to the storage service.
"""
data = aiohttp.FormData()
data.add_field("file", file_content)
data.add_field("file", BytesIO(file_content))

url = "/api/v0/storage/add_file"
logger.debug(f"Posting file on {url}")
Expand Down Expand Up @@ -669,7 +670,7 @@ async def _storage_push_file_with_message(
content_type="application/json",
)
# Add the file
data.add_field("file", file_content)
data.add_field("file", BytesIO(file_content))

url = "/api/v0/storage/add_file"
logger.debug(f"Posting file on {url}")
Expand Down