ee-client 1.2.0__tar.gz → 1.2.2__tar.gz

{ee_client-1.2.0 → ee_client-1.2.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ee-client
-Version: 1.2.0
+Version: 1.2.2
 Summary: extends the capabilities of the earthengine-api by providing custom session management and client interactions
 Author-email: Daniel Guerrero <dfgm2006@gmail.com>
 Project-URL: Homepage, https://github.com/dfguerrerom/ee-client

{ee_client-1.2.0 → ee_client-1.2.2}/ee_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: ee-client
-Version: 1.2.0
+Version: 1.2.2
 Summary: extends the capabilities of the earthengine-api by providing custom session management and client interactions
 Author-email: Daniel Guerrero <dfgm2006@gmail.com>
 Project-URL: Homepage, https://github.com/dfguerrerom/ee-client

{ee_client-1.2.0 → ee_client-1.2.2}/eeclient/__init__.py

@@ -1,6 +1,6 @@
 __title__ = "eeclient"
 __summary__ = "A client for Google Earth Engine"
-__version__ = "1.2.0"
+__version__ = "1.2.2"
 
 __author__ = "Daniel Guerrero"
 __email__ = "dfgm2006@gmail.com"

{ee_client-1.2.0 → ee_client-1.2.2}/eeclient/client.py

@@ -65,11 +65,16 @@ class EESession:
         """Initialize credentials from the initial Google tokens"""
         _google_tokens = self.sepal_user_data.google_tokens
 
+        if not _google_tokens:
+            raise EEClientError("No google tokens found in the user data.")
+
         self.expiry_date = _google_tokens.access_token_expiry_date
         self.project_id = _google_tokens.project_id
         self._credentials = _google_tokens
 
-    def get_assets_folder(self) -> str:
+    async def get_assets_folder(self) -> str:
+        if self.is_expired():
+            await self.set_credentials()
         return f"projects/{self.project_id}/assets/"
 
     def is_expired(self) -> bool:
@@ -81,6 +86,8 @@ class EESession:
         if not self._credentials:
             raise EEClientError("No credentials available")
 
+        logger.debug(f"Getting headers with project id: {self.project_id}")
+
         data = {
             "x-goog-user-project": self.project_id,
             "Authorization": f"Bearer {self._credentials.access_token}",
@@ -143,11 +150,11 @@ class EESession:
                     self.expiry_date = self._credentials.access_token_expiry_date
                     self.project_id = (
                         self._credentials.project_id
-                        if not self.enforce_project_id
+                        if self.enforce_project_id
                         else self.project_id
                     )
                     logger.debug(
-                        f"Successfully refreshed credentials !{self._credentials}."
+                        f"Successfully refreshed credentials !{self._credentials}==================. {self.project_id}"
                     )
                     return
                 else:
@@ -180,7 +187,9 @@ class EESession:
             try:
                 async with self.get_client() as client:
                     url_with_project = self.set_url_project(url)
-                    logger.debug(f"Making async {method} request to {url_with_project}")
+                    logger.debug(
+                        f"Making async {method} request to {url_with_project} with data: {data}"
+                    )
                     response = await client.request(
                         method, url_with_project, json=data, params=params
                     )

{ee_client-1.2.0 → ee_client-1.2.2}/eeclient/data.py

@@ -211,7 +211,7 @@ async def create_folder(client: "EESession", folder: Union[Path, str]) -> str:
     if not folder or not folder.strip("/"):
         raise ValueError("Folder path cannot be empty")
 
-    full_path = str(client.get_assets_folder() / Path(folder))
+    full_path = str(await client.get_assets_folder() / Path(folder))
 
     if asset := await get_asset(client, full_path):
         logger.debug(f"Folder already exists: {full_path}")

{ee_client-1.2.0 → ee_client-1.2.2}/eeclient/typing.py

@@ -71,9 +71,8 @@ class GoogleTokens(BaseModel):
 class SepalUser(BaseModel):
     id: int
     username: str
-    google_tokens: Optional[GoogleTokens] = (
-        None  # Make it optional so we can intercept missing data.
-    )
+    # Make it optional to catch missing tokens
+    google_tokens: Optional[GoogleTokens] = None
     status: str
     roles: List[str]
     system_user: bool
@@ -86,8 +85,9 @@ class SepalUser(BaseModel):
 
     @model_validator(mode="before")
     def check_google_tokens_present(cls, values: dict) -> dict:
-        # Check if the 'google_tokens' key is missing or None
-        if not values.get("google_tokens"):
+        # Look for the token in both the field name and its alias
+        token_value = values.get("google_tokens") or values.get("googleTokens")
+        if not token_value:
             raise EEClientError(
                 "Authentication required: Please authenticate via sepal. See https://docs.sepal.io/en/latest/setup/gee.html."
             )

{ee_client-1.2.0 → ee_client-1.2.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ee-client"
-version = "1.2.0"
+version = "1.2.2"
 description = "extends the capabilities of the earthengine-api by providing custom session management and client interactions"
 readme = { file = "README.rst",  content-type = "text/x-rst" }
 authors = [
@@ -66,7 +66,7 @@ branch = true
 [tool.commitizen]
 tag_format = "v$major.$minor.$patch$prerelease"
 update_changelog_on_bump = false
-version = "1.2.0"
+version = "1.2.2"
 version_files = [
     "pyproject.toml:version",
     "eeclient/__init__.py:__version__",

{ee_client-1.2.0 → ee_client-1.2.2}/tests/test_data.py

@@ -56,7 +56,7 @@ async def test_delete_asset(sepal_headers):
     sepal_session = EESession(sepal_headers=sepal_headers)
     await create_folder(sepal_session, folder="1/2/3/4/5/65/")
 
-    folder_to_delete = str(Path(sepal_session.get_assets_folder()) / "1/")
+    folder_to_delete = str(Path(await sepal_session.get_assets_folder()) / "1/")
 
     with pytest.raises(EERestException) as excinfo:
         await delete_asset(sepal_session, asset_id=folder_to_delete)

{ee_client-1.2.0 → ee_client-1.2.2}/tests/test_models.py

@@ -15,11 +15,18 @@ def test_headers(dummy_headers):
     assert sepal_headers.cookies == {"SEPAL-SESSIONID": "s:random"}
     assert sepal_headers.sepal_user.id == 10001
     assert sepal_headers.sepal_user.username == "admin"
+    assert sepal_headers.sepal_user.google_tokens
     assert sepal_headers.sepal_user.google_tokens.access_token
     assert sepal_headers.sepal_user.google_tokens.refresh_token
     assert sepal_headers.sepal_user.google_tokens.project_id == "ee-project"
 
 
+def test_headers_no_google_tokes(dummy_headers_no_google_tokens):
+
+    with pytest.raises(EEClientError):
+        SepalHeaders.model_validate(dummy_headers_no_google_tokens)
+
+
 def test_without_sepal_user(dummy_headers_no_project_id):
 
     with pytest.raises(EEClientError):