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

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: ee-client
-Version: 1.2.2
+Version: 1.3.0
 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
@@ -27,6 +27,7 @@ Requires-Dist: tomli; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: flask; extra == "dev"
+Dynamic: license-file
 
 Earth Engine Client 🌎
 ==============================
@@ -103,12 +104,13 @@ After initializing the session, use the ``operations`` property to access the ke
 
    import ee
 
-   # Initialize the Earth Engine library
+   # Initialize the Earth Engine library (this can use any authentication method/account)
+   # The purpose of this is to ensure the ee library is available for use
    ee.Initialize()
 
    # Use the operations available in the session
    result_info = session.operations.get_info(ee.Number(5))
-   print(result_info)
+   print(result_info) # the GEE server call is done using the custom EE client
 
    # Example: Generate a map ID for an Earth Engine image
    image = ee.Image('COPERNICUS/S2/20190726T104031_20190726T104035_T31TGL')

{ee_client-1.2.2 → ee_client-1.3.0}/README.rst

@@ -73,12 +73,13 @@ After initializing the session, use the ``operations`` property to access the ke
 
    import ee
 
-   # Initialize the Earth Engine library
+   # Initialize the Earth Engine library (this can use any authentication method/account)
+   # The purpose of this is to ensure the ee library is available for use
    ee.Initialize()
 
    # Use the operations available in the session
    result_info = session.operations.get_info(ee.Number(5))
-   print(result_info)
+   print(result_info) # the GEE server call is done using the custom EE client
 
    # Example: Generate a map ID for an Earth Engine image
    image = ee.Image('COPERNICUS/S2/20190726T104031_20190726T104035_T31TGL')

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

@@ -1,6 +1,6 @@
-Metadata-Version: 2.2
+Metadata-Version: 2.4
 Name: ee-client
-Version: 1.2.2
+Version: 1.3.0
 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
@@ -27,6 +27,7 @@ Requires-Dist: tomli; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
 Requires-Dist: flask; extra == "dev"
+Dynamic: license-file
 
 Earth Engine Client 🌎
 ==============================
@@ -103,12 +104,13 @@ After initializing the session, use the ``operations`` property to access the ke
 
    import ee
 
-   # Initialize the Earth Engine library
+   # Initialize the Earth Engine library (this can use any authentication method/account)
+   # The purpose of this is to ensure the ee library is available for use
    ee.Initialize()
 
    # Use the operations available in the session
    result_info = session.operations.get_info(ee.Number(5))
-   print(result_info)
+   print(result_info) # the GEE server call is done using the custom EE client
 
    # Example: Generate a map ID for an Earth Engine image
    image = ee.Image('COPERNICUS/S2/20190726T104031_20190726T104035_T31TGL')

{ee_client-1.2.2 → ee_client-1.3.0}/ee_client.egg-info/SOURCES.txt

@@ -12,9 +12,9 @@ eeclient/data.py
 eeclient/exceptions.py
 eeclient/helpers.py
 eeclient/logger.py
+eeclient/models.py
 eeclient/oauth_app.py
 eeclient/tasks.py
-eeclient/typing.py
 eeclient/export/image.py
 eeclient/export/table.py
 tests/test_client.py

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

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

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

@@ -1,19 +1,16 @@
-from pathlib import Path
 from typing import Any, Dict, Literal, Optional
 
 import os
 import time
-import json
 import asyncio
 import httpx
 from contextlib import asynccontextmanager
 
-
 from eeclient.export.image import image_to_asset, image_to_drive
 from eeclient.logger import logger
 from eeclient.exceptions import EEClientError, EERestException
 from eeclient.tasks import get_task, get_task_by_name, get_tasks
-from eeclient.typing import GEEHeaders, GoogleTokens, MapTileOptions, SepalHeaders
+from eeclient.models import GEEHeaders, GoogleTokens, MapTileOptions, SepalHeaders
 from eeclient.data import (
     create_folder,
     delete_asset,
@@ -49,7 +46,7 @@ class EESession:
         self.max_retries = 3
 
         self.enforce_project_id = enforce_project_id
-
+        logger.debug(str(sepal_headers))
         self.sepal_headers = SepalHeaders.model_validate(sepal_headers)
         self.sepal_session_id = self.sepal_headers.cookies["SEPAL-SESSIONID"]
         self.sepal_user_data = self.sepal_headers.sepal_user
@@ -61,12 +58,13 @@ class EESession:
         # if not I will get this error:
         # httpx.HTTPStatusError: Client error '401 Unauthorized' for url 'https://danielg.sepal.io/api/user-files/listFiles/?path=%2F&extensions='
 
-    def _initialize_credentials(self):
+    def _initialize_credentials(self) -> None:
         """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.")
+            # Get them with the sepal_session_id
+            return asyncio.run(self.set_credentials())
 
         self.expiry_date = _google_tokens.access_token_expiry_date
         self.project_id = _google_tokens.project_id

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

@@ -5,7 +5,7 @@ from typing import TYPE_CHECKING, List, Optional, Union
 
 from eeclient.exceptions import EERestException
 from eeclient.logger import logger
-from eeclient.typing import MapTileOptions
+from eeclient.models import MapTileOptions
 from eeclient.helpers import _get_ee_image, convert_asset_id_to_asset_name
 
 if TYPE_CHECKING:

{ee_client-1.2.2 → ee_client-1.3.0}/eeclient/helpers.py

@@ -1,10 +1,15 @@
+import os
+import requests
+import logging
+from eeclient.models import SepalHeaders, SepalUser
+from eeclient.logger import logger
 from typing import Union
 
 from ee.imagecollection import ImageCollection
 from ee.feature import Feature
 from ee.featurecollection import FeatureCollection
 from ee.image import Image
-from eeclient.typing import MapTileOptions
+from eeclient.models import MapTileOptions
 from ee.data import convert_asset_id_to_asset_name  # type: ignore: it will be imported from another moduel
 
 
@@ -51,3 +56,46 @@ def parse_cookie_string(cookie_string):
             key, value = key_value
             cookies[key] = value
     return cookies
+
+
+def get_sepal_headers_from_auth():
+    sepal_user = os.getenv("LOCAL_SEPAL_USER")
+    sepal_password = os.getenv("LOCAL_SEPAL_PASSWORD")
+    sepal_host = os.getenv("SEPAL_HOST")
+
+    if not sepal_user or not sepal_password or not sepal_host:
+        raise ValueError(
+            "LOCAL_SEPAL_USER, LOCAL_SEPAL_PASSWORD, and SEPAL_HOST must be set"
+        )
+
+    session = requests.Session()
+    session.verify = False
+
+    creds_response = session.post(
+        f"https://{sepal_host}/api/user/login",
+        headers={
+            "Content-Type": "application/x-www-form-urlencoded; charset=utf-8",
+            "No-Auth-Challenge": "true",
+        },
+        auth=(sepal_user, sepal_password),
+        data="",
+    )
+
+    creds_response.raise_for_status()
+
+    logger.debug(f"Authentication successful. Cookies: {session.cookies}")
+    logger.debug(f"Response: {creds_response.json()}")
+
+    sepal_user_obj = SepalUser.model_validate(creds_response.json())
+
+    # Replace the project_id with the one from the environment
+    sepal_user_obj.google_tokens.project_id = "sepal-ui-421413"
+
+    cookies_dict = {cookie.name: cookie.value for cookie in session.cookies}
+
+    sepal_headers = {
+        "cookie": cookies_dict,
+        "sepal-user": sepal_user_obj,
+    }
+
+    return SepalHeaders.model_validate(sepal_headers)

{ee_client-1.2.2 → ee_client-1.3.0}/eeclient/logger.py

@@ -1,3 +1,4 @@
+import os
 import sys
 import logging
 from pathlib import Path
@@ -12,14 +13,32 @@ RESET = "\033[0m"
 
 class CustomLogger:
     def __init__(
-        self, name: str, level: int = logging.DEBUG, module_color: str = BLUE_BG
+        self, name: str, level: int = logging.INFO, module_color: str = BLUE_BG
     ):
+        env_log_level_str = os.getenv(
+            "EE_CLIENT_LOG_LEVEL", logging.getLevelName(level)
+        ).upper()
+        try:
+            effective_level = logging.getLevelName(env_log_level_str)
+            if not isinstance(effective_level, int):
+                effective_level = level
+                print(
+                    f"Warning: Invalid EE_CLIENT_LOG_LEVEL '{env_log_level_str}'. Defaulting to {logging.getLevelName(level)}.",
+                    file=sys.stderr,
+                )
+        except ValueError:
+            effective_level = level
+            print(
+                f"Warning: Could not parse EE_CLIENT_LOG_LEVEL '{env_log_level_str}'. Defaulting to {logging.getLevelName(level)}.",
+                file=sys.stderr,
+            )
+
         self.logger = logging.getLogger(name)
-        self.logger.setLevel(level)
+        self.logger.setLevel(effective_level)
 
         # Create a colored console handler.
         console_handler = logging.StreamHandler(sys.stdout)
-        console_handler.setLevel(level)
+        console_handler.setLevel(effective_level)  # Also set handler level
 
         # Build the format string using the module_color for the logger's name.
         format_str = f"%(log_color)s%(asctime)s - {module_color}%(name)s{RESET} - %(levelname)s - %(message)s"

ee_client-1.2.2/eeclient/typing.py → ee_client-1.3.0/eeclient/models.py

@@ -69,38 +69,18 @@ class GoogleTokens(BaseModel):
 
 
 class SepalUser(BaseModel):
-    id: int
     username: str
-    # Make it optional to catch missing tokens
+    id: Optional[int] = None
     google_tokens: Optional[GoogleTokens] = None
-    status: str
-    roles: List[str]
-    system_user: bool
-    admin: bool
+    status: Optional[str] = None
+    roles: Optional[List[str]] = None
+    system_user: Optional[bool] = None
 
     model_config = ConfigDict(
         alias_generator=to_camel,
         populate_by_name=True,
     )
 
-    @model_validator(mode="before")
-    def check_google_tokens_present(cls, values: dict) -> dict:
-        # 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."
-            )
-        return values
-
-    @model_validator(mode="after")
-    def check_google_tokens(self) -> "SepalUser":
-        if not self.google_tokens:
-            raise EEClientError(
-                "Authentication required: Please authenticate via sepal. See https://docs.sepal.io/en/latest/setup/gee.html."
-            )
-        return self
-
 
 class SepalHeaders(BaseModel):
     cookies: SepalCookies = Field(..., alias="cookie")

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

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ee-client"
-version = "1.2.2"
+version = "1.3.0"
 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.2"
+version = "1.3.0"
 version_files = [
     "pyproject.toml:version",
     "eeclient/__init__.py:__version__",

{ee_client-1.2.2 → ee_client-1.3.0}/tests/test_client.py

@@ -16,7 +16,7 @@ def test_init_client(sepal_headers):
 def test_is_expired(sepal_headers, dummy_headers):
 
     sepal_session = EESession(sepal_headers=sepal_headers)
-    assert sepal_session.is_expired() == True
+    assert sepal_session.is_expired() == False
 
     sepal_session = EESession(sepal_headers=dummy_headers)
     assert sepal_session.is_expired() == True

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

@@ -4,7 +4,7 @@ import sys
 import pytest
 
 from eeclient.exceptions import EEClientError
-from eeclient.typing import SepalHeaders
+from eeclient.models import SepalHeaders
 
 sys.path.append("..")
 
@@ -21,14 +21,7 @@ def test_headers(dummy_headers):
     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):
-
         SepalHeaders.model_validate(dummy_headers_no_project_id)