ee-client 2.5.0__tar.gz → 2.5.2__tar.gz

{ee_client-2.5.0 → ee_client-2.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ee-client
-Version: 2.5.0
+Version: 2.5.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
@@ -16,7 +16,6 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: earthengine-api
 Requires-Dist: httpx[http2]
-Requires-Dist: aiogoogle
 Requires-Dist: tenacity
 Requires-Dist: pydantic
 Provides-Extra: dev
@@ -26,6 +25,7 @@ Requires-Dist: nox; extra == "dev"
 Requires-Dist: tomli; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-asyncio; extra == "dev"
 Requires-Dist: flask; extra == "dev"
 Dynamic: license-file
 

{ee_client-2.5.0 → ee_client-2.5.2}/ee_client.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: ee-client
-Version: 2.5.0
+Version: 2.5.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
@@ -16,7 +16,6 @@ Description-Content-Type: text/x-rst
 License-File: LICENSE
 Requires-Dist: earthengine-api
 Requires-Dist: httpx[http2]
-Requires-Dist: aiogoogle
 Requires-Dist: tenacity
 Requires-Dist: pydantic
 Provides-Extra: dev
@@ -26,6 +25,7 @@ Requires-Dist: nox; extra == "dev"
 Requires-Dist: tomli; extra == "dev"
 Requires-Dist: mypy; extra == "dev"
 Requires-Dist: pytest; extra == "dev"
+Requires-Dist: pytest-asyncio; extra == "dev"
 Requires-Dist: flask; extra == "dev"
 Dynamic: license-file
 

{ee_client-2.5.0 → ee_client-2.5.2}/ee_client.egg-info/SOURCES.txt

@@ -26,5 +26,6 @@ eeclient/interfaces/tasks.py
 tests/test_cache.py
 tests/test_client.py
 tests/test_data.py
+tests/test_export_table.py
 tests/test_integration_get_assets.py
 tests/test_models.py

{ee_client-2.5.0 → ee_client-2.5.2}/ee_client.egg-info/requires.txt

@@ -1,6 +1,5 @@
 earthengine-api
 httpx[http2]
-aiogoogle
 tenacity
 pydantic
 
@@ -11,4 +10,5 @@ nox
 tomli
 mypy
 pytest
+pytest-asyncio
 flask

{ee_client-2.5.0 → ee_client-2.5.2}/eeclient/__init__.py

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

{ee_client-2.5.0 → ee_client-2.5.2}/eeclient/client.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from typing import Any, Dict, Literal, Optional
 
 import os

{ee_client-2.5.0 → ee_client-2.5.2}/eeclient/exceptions.py

@@ -1,3 +1,5 @@
+from __future__ import annotations
+
 from ee.ee_exception import EEException
 
 

{ee_client-2.5.0 → ee_client-2.5.2}/eeclient/export/table.py

@@ -58,7 +58,7 @@ class ExportOptions(BaseExportModel):
     workload_tag: Optional[str] = None
     priority: Optional[int] = None
     file_export_options: Optional[DriveOptions] = None
-    drive_export_options: Optional[AssetOptions] = None
+    asset_export_options: Optional[AssetOptions] = None
     # TODO: Add support for other export options.
     # See the api: https://developers.google.com/earth-engine/reference/rest/v1alpha/projects.table/export#TableFileExportOptions
 
@@ -105,7 +105,7 @@ async def _export_table(
         workload_tag=workload_tag,
         priority=priority,
         file_export_options=drive_options,
-        drive_export_options=asset_options,
+        asset_export_options=asset_options,
     )
 
     params = export_options.model_dump(by_alias=True, exclude_none=True)

{ee_client-2.5.0 → ee_client-2.5.2}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "ee-client"
-version = "2.5.0"
+version = "2.5.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 = [
@@ -13,7 +13,6 @@ authors = [
 dependencies = [
 	"earthengine-api",
     "httpx[http2]",
-    "aiogoogle",
     "tenacity",
     "pydantic",
 ]
@@ -40,6 +39,7 @@ dev = [
     "tomli",
     "mypy",
     "pytest",
+    "pytest-asyncio",
     "flask",
 ]
 
@@ -66,7 +66,7 @@ branch = true
 [tool.commitizen]
 tag_format = "v$major.$minor.$patch$prerelease"
 update_changelog_on_bump = false
-version = "2.5.0"
+version = "2.5.2"
 version_files = [
     "pyproject.toml:version",
     "eeclient/__init__.py:__version__",

{ee_client-2.5.0 → ee_client-2.5.2}/tests/test_data.py

@@ -123,26 +123,6 @@ async def test_get_info(sepal_headers):
     assert result is not None
 
 
-@pytest.mark.asyncio
-async def test_create_and_get_asset(sepal_headers):
-    """
-    Create a folder asset and then retrieve it via get_asset.
-    """
-    session = EESession(sepal_headers=sepal_headers)
-    folder_name = f"test_folder_{random_hash()}/subfolder"
-    folder_id = await create_folder(session, folder=folder_name)
-
-    # Allow some time for the asset to be fully registered
-    await asyncio.sleep(2)
-    asset = await get_asset(session, asset_id=folder_id)
-    assert asset is not None, f"Asset not found: {folder_id}"
-    assert asset["id"] == folder_id
-    assert asset["type"] == "FOLDER"
-
-    # Clean up
-    await delete_folder(session, folder_id=folder_id, recursive=True)
-
-
 @pytest.mark.asyncio
 async def test_list_assets_concurrently(sepal_headers):
     """

ee_client-2.5.2/tests/test_export_table.py

@@ -0,0 +1,79 @@
+from unittest.mock import AsyncMock, patch
+
+import pytest
+
+from eeclient.export.table import (
+    AssetOptions,
+    DriveDestination,
+    DriveOptions,
+    EarthEngineDestination,
+    ExportOptions,
+    TableFileFormat,
+    table_to_asset_async,
+)
+
+
+def test_asset_export_options_serialize_with_correct_key():
+    opts = ExportOptions(
+        expression={"x": 1},
+        asset_export_options=AssetOptions(
+            earth_engine_destination=EarthEngineDestination(name="projects/p/assets/t")
+        ),
+    )
+    payload = opts.model_dump(by_alias=True, exclude_none=True)
+    assert "assetExportOptions" in payload
+    assert "driveExportOptions" not in payload
+    assert payload["assetExportOptions"]["earthEngineDestination"]["name"] == (
+        "projects/p/assets/t"
+    )
+
+
+def test_drive_export_options_serialize_as_file_export_options():
+    opts = ExportOptions(
+        expression={"x": 1},
+        file_export_options=DriveOptions(
+            file_format=TableFileFormat.CSV,
+            drive_destination=DriveDestination(filename_prefix="out"),
+        ),
+    )
+    payload = opts.model_dump(by_alias=True, exclude_none=True)
+    assert "fileExportOptions" in payload
+    assert "driveExportOptions" not in payload
+    assert "assetExportOptions" not in payload
+
+
+@pytest.mark.asyncio
+async def test_table_to_asset_async_sends_asset_export_options():
+    client = AsyncMock()
+    client.rest_call = AsyncMock(
+        return_value={
+            "name": "projects/p/operations/X",
+            "metadata": {
+                "@type": "type.googleapis.com/google.earthengine.v1.OperationMetadata",
+                "description": "myExportTableTask",
+                "priority": 100,
+                "createTime": "2026-04-20T00:00:00Z",
+                "type": "EXPORT_FEATURES",
+            },
+            "done": False,
+        }
+    )
+
+    fake_expression = {"values": {}, "result": "0"}
+    with patch(
+        "eeclient.export.table.serializer.encode", return_value=fake_expression
+    ), patch("eeclient.export.table.encodable.Encodable", object):
+        await table_to_asset_async(
+            client=client,
+            collection=object(),
+            asset_id="projects/p/assets/t",
+        )
+
+    assert client.rest_call.await_count == 1
+    _, kwargs = client.rest_call.call_args
+    payload = kwargs["data"]
+    assert "assetExportOptions" in payload
+    assert "driveExportOptions" not in payload
+    assert payload["assetExportOptions"]["earthEngineDestination"]["name"] == (
+        "projects/p/assets/t"
+    )