ddsapi 0.6b3__tar.gz → 0.6b5__tar.gz

{ddsapi-0.6b3 → ddsapi-0.6b5}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: ddsapi
-Version: 0.6b3
+Version: 0.6b5
 Summary: Python Client to access and download data from CMCC Data Delivery System (DDS)
 Home-page: https://github.com/CMCC-Foundation/ddsapi-client/
 Author: CMCC Data Delivery System Team
@@ -18,10 +18,17 @@ Classifier: Topic :: Scientific/Engineering :: Hydrology
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: netCDF4>=1.5.3
-Requires-Dist: scipy>=1.5.2
-Requires-Dist: requests>=2.23.0
-Requires-Dist: xarray>=0.16.0
+Requires-Dist: geokube==0.2.7.1
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # DDSAPI-Client
 Python Client to access and download data from [CMCC Data Delivery System (DDS)](https://dds.cmcc.it)

{ddsapi-0.6b3 → ddsapi-0.6b5}/ddsapi/api.py

@@ -30,6 +30,7 @@ import shutil
 from typing import Any, Union, Iterable
 import urllib3
 import xarray as xr
+from geokube import open_datacube
 
 from .cache import CacheManager
 
@@ -186,13 +187,12 @@ class _Result:
         if os.path.isdir(self.target_path):
             ds_list = []
             for f in os.listdir(self.target_path):
-                ds = xr.open_dataset(os.path.join(self.target_path, f))
+                ds = xr.open_dataset(os.path.join(self.target_path, f), decode_coords='all')
                 ds_list.append(ds)
             if len(ds_list) == 1:
                 return ds_list[0]
             return ds_list
-
-        return xr.open_dataset(self.target_path)
+        return xr.open_dataset(self.target_path, decode_coords='all')
     
 class EnvVarNames:
     RC_FILE: str = "DDSAPI_RC"
@@ -354,8 +354,14 @@ class Client:
                 level=level, format="%(asctime)s %(levelname)s %(message)s"
             )
         config = Config()
-        self.url = config.url
-        self.key = config.key
+        if url is None:
+            self.url = config.url
+        else:
+            self.url = url
+        if key is None:
+            self.key = config.key
+        else:
+            self.key = key
         self.verify = config.verify
         self.cache: CacheManager = CacheManager(
             cache_dir=config.cachedir,
@@ -637,12 +643,14 @@ class Client:
         assert dataset_id, "'dataset_id' cannot be 'None'"
         assert product_id, "'product_id' cannot be 'None'"
         session = self.session
+        streaming = False
         if "format" not in request:
             request["temp_file"] = target
         cached_target = self.cache.maybe_get_from_cache(dataset_id=dataset_id, product_id=product_id, request=request)
         if cached_target:
             return cached_target
-
+        if request["format"] == "zarr":
+            streaming = True
         jreply = self._submit(
             f"{self.url}/datasets/{dataset_id}/{product_id}/execute",
             request,
@@ -703,12 +711,16 @@ class Client:
                 else:
                     _target = target
                 try:
-                    result.download(_target)
-                    self.cache.add_to_cache(
-                        dataset_id=dataset_id, 
-                        product_id=product_id, 
-                        request=request, 
-                        target=result.get_files(), overwrite=False)
+                    if not streaming:
+                        result.download(_target)
+                        self.cache.add_to_cache(
+                            dataset_id=dataset_id,
+                            product_id=product_id,
+                            request=request,
+                            target=result.get_files(), overwrite=False)
+                    else:
+                        self.info(f"Opening zarr in streaming.... {result._download_url}")
+                        return xr.open_dataset(result._download_url, decode_coords='all', engine="zarr")
                 except RuntimeError as err:
                     self.logger.error(str(err))
                     return

{ddsapi-0.6b3 → ddsapi-0.6b5}/ddsapi/cache.py

@@ -96,12 +96,12 @@ class CacheManager:
         if isinstance(target, list):
             ds_list = []
             for f in target:
-                ds = xr.open_dataset(os.path.join(self.cache_dir, f))
+                ds = xr.open_dataset(os.path.join(self.cache_dir, f), decode_coords='all')
                 ds_list.append(ds)
             if len(ds_list) == 1:
                 return ds_list[0]
             return ds_list
         elif isinstance(target, str):
-            return xr.open_dataset(os.path.join(self.cache_dir, target))
+            return xr.open_dataset(os.path.join(self.cache_dir, target), decode_coords='all')
         else:
             raise TypeError

{ddsapi-0.6b3 → ddsapi-0.6b5}/ddsapi.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.2
 Name: ddsapi
-Version: 0.6b3
+Version: 0.6b5
 Summary: Python Client to access and download data from CMCC Data Delivery System (DDS)
 Home-page: https://github.com/CMCC-Foundation/ddsapi-client/
 Author: CMCC Data Delivery System Team
@@ -18,10 +18,17 @@ Classifier: Topic :: Scientific/Engineering :: Hydrology
 Requires-Python: >=3.7
 Description-Content-Type: text/markdown
 License-File: LICENSE
-Requires-Dist: netCDF4>=1.5.3
-Requires-Dist: scipy>=1.5.2
-Requires-Dist: requests>=2.23.0
-Requires-Dist: xarray>=0.16.0
+Requires-Dist: geokube==0.2.7.1
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license
+Dynamic: requires-dist
+Dynamic: requires-python
+Dynamic: summary
 
 # DDSAPI-Client
 Python Client to access and download data from [CMCC Data Delivery System (DDS)](https://dds.cmcc.it)

ddsapi-0.6b5/ddsapi.egg-info/requires.txt

@@ -0,0 +1 @@
+geokube==0.2.7.1

{ddsapi-0.6b3 → ddsapi-0.6b5}/setup.py

@@ -17,7 +17,7 @@ with open("README.md", "r") as f:
 
 setuptools.setup(
     name="ddsapi",
-    version="0.6b3",
+    version="0.6b5",
     author="CMCC Data Delivery System Team",
     author_email="dds-support@cmcc.it",
     description=(
@@ -29,10 +29,12 @@ setuptools.setup(
     url="https://github.com/CMCC-Foundation/ddsapi-client/",
     packages=setuptools.find_packages(),
     install_requires=[
-        "netCDF4>=1.5.3",
-        "scipy>=1.5.2",
-        "requests>=2.23.0",
-        "xarray>=0.16.0",
+       "geokube==0.2.7.1"
+        #"netCDF4>=1.5.3",
+        #"scipy>=1.5.2",
+        #"requests>=2.23.0",
+        #"xarray==2022.10.0",
+        #"numpy==1.26.0"
     ],
     classifiers=[
         "Development Status :: 4 - Beta",

ddsapi-0.6b3/ddsapi.egg-info/requires.txt

@@ -1,4 +0,0 @@
-netCDF4>=1.5.3
-scipy>=1.5.2
-requests>=2.23.0
-xarray>=0.16.0