From dd0918bc7b36cd287330d4c449c56098402a0f90 Mon Sep 17 00:00:00 2001
From: Cresson Remi <remi.cresson@irstea.fr>
Date: Tue, 21 May 2024 16:38:25 +0200
Subject: [PATCH 1/5] add: sign() in __init__
---
dinamis_sdk/__init__.py | 2 +-
setup.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dinamis_sdk/__init__.py b/dinamis_sdk/__init__.py
index 9759375..99cedb7 100644
--- a/dinamis_sdk/__init__.py
+++ b/dinamis_sdk/__init__.py
@@ -1,5 +1,5 @@
"""Dinamis SDK module."""
import pkg_resources
__version__ = pkg_resources.require("dinamis-sdk")[0].version
-from dinamis_sdk.s3 import sign_inplace # noqa
+from dinamis_sdk.s3 import sign, sign_inplace # noqa
from dinamis_sdk import auth # noqa
diff --git a/setup.py b/setup.py
index c80046c..3655b4b 100644
--- a/setup.py
+++ b/setup.py
@@ -13,7 +13,7 @@ install_requires = [
setup(
name="dinamis-sdk",
- version="0.1.7",
+ version="0.1.8",
description="DINAMIS SDK",
python_requires=">=3.8",
author="Remi Cresson",
--
GitLab
From cad165e412b1b6e4fad2d38162420122168c651f Mon Sep 17 00:00:00 2001
From: Cresson Remi <remi.cresson@irstea.fr>
Date: Tue, 21 May 2024 19:45:55 +0200
Subject: [PATCH 2/5] Update file __init__.py
---
dinamis_sdk/__init__.py | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/dinamis_sdk/__init__.py b/dinamis_sdk/__init__.py
index 99cedb7..68ef2f5 100644
--- a/dinamis_sdk/__init__.py
+++ b/dinamis_sdk/__init__.py
@@ -1,5 +1,13 @@
"""Dinamis SDK module."""
import pkg_resources
__version__ = pkg_resources.require("dinamis-sdk")[0].version
-from dinamis_sdk.s3 import sign, sign_inplace # noqa
+from dinamis_sdk.s3 import (
+ sign,
+ sign_inplace,
+ sign_url,
+ sign_item,
+ sign_assets,
+ sign_asset,
+ sign_item_collection
+) # noqa
from dinamis_sdk import auth # noqa
--
GitLab
From ae7cd142b9f6be15cf3bf6dbdec9696cbc340a53 Mon Sep 17 00:00:00 2001
From: Cresson Remi <remi.cresson@irstea.fr>
Date: Tue, 21 May 2024 19:59:56 +0200
Subject: [PATCH 3/5] Update 2 files
- /dinamis_sdk/s3.py
- /dinamis_sdk/__init__.py
---
dinamis_sdk/__init__.py | 2 +-
dinamis_sdk/s3.py | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/dinamis_sdk/__init__.py b/dinamis_sdk/__init__.py
index 68ef2f5..077ed6b 100644
--- a/dinamis_sdk/__init__.py
+++ b/dinamis_sdk/__init__.py
@@ -4,7 +4,7 @@ __version__ = pkg_resources.require("dinamis-sdk")[0].version
from dinamis_sdk.s3 import (
sign,
sign_inplace,
- sign_url,
+ sign_urls,
sign_item,
sign_assets,
sign_asset,
diff --git a/dinamis_sdk/s3.py b/dinamis_sdk/s3.py
index ef210fd..0fe2b39 100644
--- a/dinamis_sdk/s3.py
+++ b/dinamis_sdk/s3.py
@@ -145,7 +145,7 @@ def sign_string(url: str, copy: bool = True) -> str:
return sign_urls(urls=[url])[url]
-def sign_urls(urls: List[str]) -> str:
+def sign_urls(urls: List[str]) -> Dict[str, str]:
"""Sign URLs with a S3 Token.
Signing URL allows read access to files in storage.
--
GitLab
From c8f847560cc8ff257603bde75301bf2424fe8da9 Mon Sep 17 00:00:00 2001
From: Cresson Remi <remi.cresson@irstea.fr>
Date: Tue, 21 May 2024 20:03:52 +0200
Subject: [PATCH 4/5] Update 2 files
- /dinamis_sdk/s3.py
- /dinamis_sdk/__init__.py
---
dinamis_sdk/__init__.py | 1 -
dinamis_sdk/s3.py | 4 ++--
2 files changed, 2 insertions(+), 3 deletions(-)
diff --git a/dinamis_sdk/__init__.py b/dinamis_sdk/__init__.py
index 077ed6b..dfa1b29 100644
--- a/dinamis_sdk/__init__.py
+++ b/dinamis_sdk/__init__.py
@@ -6,7 +6,6 @@ from dinamis_sdk.s3 import (
sign_inplace,
sign_urls,
sign_item,
- sign_assets,
sign_asset,
sign_item_collection
) # noqa
diff --git a/dinamis_sdk/s3.py b/dinamis_sdk/s3.py
index 0fe2b39..0ea19ec 100644
--- a/dinamis_sdk/s3.py
+++ b/dinamis_sdk/s3.py
@@ -487,9 +487,9 @@ def get_signed_urls(
chunk_start = i_chunk * MAX_URLS
chunk_end = min(chunk_start + MAX_URLS, n_urls)
not_signed_urls_chunk = not_signed_urls[chunk_start:chunk_end]
- params={"urls": not_signed_urls_chunk}
+ params = {"urls": not_signed_urls_chunk}
if SIGNED_URL_DURATION_SECONDS:
- params.update({"duration_seconds": SIGNED_URL_DURATION_SECONDS})
+ params["duration_seconds"] = SIGNED_URL_DURATION_SECONDS
response = session.post(
f"{S3_SIGNING_ENDPOINT}sign_urls",
params=params,
--
GitLab
From 46d7b61ebeccc1ef05712e4507789f9fd1ce9a34 Mon Sep 17 00:00:00 2001
From: Cresson Remi <remi.cresson@irstea.fr>
Date: Tue, 21 May 2024 20:09:00 +0200
Subject: [PATCH 5/5] Update 3 files
- /dinamis_sdk/auth.py
- /tests/test_spot-6-7-drs.py
- /tests/test_super-s2.py
---
dinamis_sdk/auth.py | 4 +++-
tests/test_spot-6-7-drs.py | 2 +-
tests/test_super-s2.py | 2 +-
3 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/dinamis_sdk/auth.py b/dinamis_sdk/auth.py
index 6c0d510..d2fbd21 100644
--- a/dinamis_sdk/auth.py
+++ b/dinamis_sdk/auth.py
@@ -9,8 +9,8 @@ from typing import Dict
import requests
from pydantic import BaseModel, Field # pylint: disable = no-name-in-module
import qrcode
-from .utils import log, JWT_FILE, TOKEN_ENDPOINT, AUTH_BASE_URL, TOKEN_SERVER
import urllib3
+from .utils import log, JWT_FILE, TOKEN_ENDPOINT, AUTH_BASE_URL, TOKEN_SERVER
class JWT(BaseModel): # pylint: disable = R0903
@@ -250,6 +250,7 @@ class OAuth2Session:
class TokenServer:
+ """Token server."""
def __init__(self, endpoint: str, total_retry=5, backoff_factor=0.8):
self.endpoint = endpoint
self.session = requests.Session()
@@ -271,6 +272,7 @@ session = TokenServer(TOKEN_SERVER) if TOKEN_SERVER else OAuth2Session()
def _get_access_token():
+ """Get an access token."""
return session.get_access_token()
diff --git a/tests/test_spot-6-7-drs.py b/tests/test_spot-6-7-drs.py
index 814e232..eb4f285 100644
--- a/tests/test_spot-6-7-drs.py
+++ b/tests/test_spot-6-7-drs.py
@@ -2,7 +2,7 @@ import dinamis_sdk
import pystac_client
api = pystac_client.Client.open(
- 'https://stacapi-dinamis.apps.okd.crocc.meso.umontpellier.fr',
+ 'https://stacapi-cdos.apps.okd.crocc.meso.umontpellier.fr',
modifier=dinamis_sdk.sign_inplace,
)
res = api.search(
diff --git a/tests/test_super-s2.py b/tests/test_super-s2.py
index 5442f74..5548f21 100644
--- a/tests/test_super-s2.py
+++ b/tests/test_super-s2.py
@@ -2,7 +2,7 @@ import dinamis_sdk
import pystac_client
api = pystac_client.Client.open(
- 'https://stacapi-dinamis.apps.okd.crocc.meso.umontpellier.fr',
+ 'https://stacapi-cdos.apps.okd.crocc.meso.umontpellier.fr',
modifier=dinamis_sdk.sign_inplace,
)
res = api.search(
--
GitLab