Skip to content
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.

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

🐛 datcore-adapter (Pennsieve API): filter out deleted files #5254

Merged
merged 40 commits into from
Jan 19, 2024
Merged
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
4170ab5
First attempt to get rid of authentication pop-up when container dies
elisabettai Sep 22, 2022
e151aaf
Merge branch 'master' into traefik_routes_authentication_popup
mrnicegyu11 Oct 5, 2022
5ba4ca4
Merge branch 'master' into traefik_routes_authentication_popup
sanderegg Oct 6, 2022
7c84df1
fixed regexp
sanderegg Oct 6, 2022
8ce9069
ensure priority is the same as for the webserver
sanderegg Oct 6, 2022
fdeceac
add some docs
sanderegg Oct 6, 2022
56ee773
Merge pull request #1 from sanderegg/elisabettai-traefik_routes_authe…
elisabettai Oct 6, 2022
17a667a
fixed merge conflit
elisabettai Oct 10, 2022
dd92f3c
Merge branch 'master' of github.com:elisabettai/osparc-simcore
elisabettai Nov 8, 2022
d65c8b3
Merge branch 'master' of github.com:elisabettai/osparc-simcore
elisabettai Nov 23, 2022
d92766e
Merge branch 'master' of github.com:elisabettai/osparc-simcore
elisabettai Dec 15, 2022
00a4eb7
Merge branch 'master' of github.com:elisabettai/osparc-simcore
elisabettai Jan 6, 2023
5890649
Merge branch 'master' of github.com:elisabettai/osparc-simcore
elisabettai Jan 18, 2023
fecae11
Merge branch 'master' of github.com:elisabettai/osparc-simcore
elisabettai Feb 28, 2023
499b1f9
Merge branch 'master' of github.com:elisabettai/osparc-simcore
elisabettai Mar 13, 2023
c35d724
Merge branch 'master' of github.com:elisabettai/osparc-simcore
elisabettai Mar 15, 2023
1167e64
Merge branch 'master' of github.com:elisabettai/osparc-simcore
elisabettai Mar 20, 2023
f51c9da
Merge branch 'master' of github.com:elisabettai/osparc-simcore
elisabettai Mar 24, 2023
75d6fce
Merge branch 'master' of github.com:elisabettai/osparc-simcore
elisabettai Apr 18, 2023
2ad33c0
Merge branch 'master' of github.com:elisabettai/osparc-simcore
elisabettai May 9, 2023
6712b40
Merge branch 'master' of github.com:elisabettai/osparc-simcore
elisabettai May 10, 2023
f9fdb77
Merge branch 'master' of github.com:elisabettai/osparc-simcore
elisabettai May 24, 2023
271e8e6
Merge branch 'master' of github.com:elisabettai/osparc-simcore
elisabettai Jun 1, 2023
f684bb4
Merge branch 'master' of github.com:elisabettai/osparc-simcore
elisabettai Jun 20, 2023
8a47aa3
Merge branch 'master' of github.com:elisabettai/osparc-simcore
elisabettai Jun 26, 2023
aebf90a
Merge branch 'master' of github.com:elisabettai/osparc-simcore
elisabettai Jul 3, 2023
da2e180
Merge branch 'master' of github.com:elisabettai/osparc-simcore
elisabettai Jul 17, 2023
58e624b
Merge branch 'master' of github.com:elisabettai/osparc-simcore
elisabettai Aug 8, 2023
cf0ddc2
Merge branch 'ITISFoundation:master' into master
elisabettai Sep 13, 2023
d39581c
Merge branch 'ITISFoundation:master' into master
elisabettai Oct 4, 2023
681310e
Merge branch 'ITISFoundation:master' into master
elisabettai Oct 23, 2023
984efc1
Merge branch 'ITISFoundation:master' into master
elisabettai Nov 7, 2023
56530ac
Merge branch 'ITISFoundation:master' into master
elisabettai Dec 5, 2023
d8e4f04
Merge branch 'ITISFoundation:master' into master
elisabettai Dec 7, 2023
5a9e20c
Merge branch 'ITISFoundation:master' into master
elisabettai Dec 13, 2023
27e8f6c
Merge branch 'ITISFoundation:master' into master
elisabettai Dec 19, 2023
62f06a3
Merge branch 'ITISFoundation:master' into master
elisabettai Jan 15, 2024
04eaa89
Filter our DELETED packages
elisabettai Jan 19, 2024
041c016
Merge branch 'datcore-fix' of github.com:elisabettai/osparc-simcore i…
elisabettai Jan 19, 2024
c0f72b8
Minor @GitHK
elisabettai Jan 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
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
from dataclasses import dataclass
from itertools import islice
from pathlib import Path
from typing import Any, Final, Optional, TypedDict, cast
from typing import Any, Final, TypedDict, cast

import boto3
from aiocache import SimpleMemoryCache
Expand Down Expand Up @@ -128,8 +128,8 @@ async def _request(
api_secret: str,
method: str,
path: str,
params: Optional[dict[str, Any]] = None,
json: Optional[dict[str, Any]] = None,
params: dict[str, Any] | None = None,
json: dict[str, Any] | None = None,
) -> Any:
response = await self.client.request(
method,
Expand Down Expand Up @@ -181,7 +181,7 @@ async def _get_dataset_packages(
page_size: int,
cursor: str,
) -> dict[str, Any]:
return cast(
packages = cast(
dict[str, Any],
await self._request(
api_key,
Expand All @@ -195,6 +195,10 @@ async def _get_dataset_packages(
},
),
)
packages["packages"] = [
f for f in packages["packages"] if f["content"]["state"] != "DELETED"
]
return packages

async def _get_package(
self, api_key: str, api_secret: str, package_id: str
Expand Down
Loading