freva-client 2404.0.1__py3-none-any.whl → 2408.0.0.dev2__py3-none-any.whl

freva_client/utils/databrowser_utils.py

@@ -26,8 +26,8 @@ class Config:
         uniq_key: Literal["file", "uri"] = "file",
         flavour: str = "freva",
     ) -> None:
-
-        self.databrowser_url = self.get_databrowser_url(host)
+        self.databrowser_url = f"{self.get_api_url(host)}/databrowser"
+        self.auth_url = f"{self.get_api_url(host)}/auth/v2"
         self.uniq_key = uniq_key
         self._flavour = flavour
 
@@ -57,7 +57,9 @@ class Config:
             host = f"{host}:{port}"
         return f"{scheme}://{host}"
 
-    def _read_config(self, path: Path, file_type: Literal["toml", "ini"]) -> str:
+    def _read_config(
+        self, path: Path, file_type: Literal["toml", "ini"]
+    ) -> str:
         """Read the configuration."""
         data_types = {"toml": self._read_toml, "ini": self._read_ini}
         try:
@@ -72,7 +74,9 @@ class Config:
         try:
             res = requests.get(f"{self.databrowser_url}/overview", timeout=3)
         except requests.exceptions.ConnectionError:
-            raise ValueError(f"Could not connect to {self.databrowser_url}") from None
+            raise ValueError(
+                f"Could not connect to {self.databrowser_url}"
+            ) from None
         return cast(Dict[str, Any], res.json())
 
     def _get_databrowser_host_from_config(self) -> str:
@@ -87,7 +91,9 @@ class Config:
             Path(appdirs.user_config_dir("freva")) / "freva.toml": "toml",
             Path(self.get_dirs(user=True)) / "freva.toml": "toml",
             freva_config: "toml",
-            Path(os.environ.get("EVALUATION_SYSTEM_CONFIG_FILE") or eval_conf): "ini",
+            Path(
+                os.environ.get("EVALUATION_SYSTEM_CONFIG_FILE") or eval_conf
+            ): "ini",
         }
         for config_path, config_type in paths.items():
             if config_path.is_file():
@@ -114,13 +120,24 @@ class Config:
     @property
     def search_url(self) -> str:
         """Define the data search endpoint."""
-        return f"{self.databrowser_url}/data_search/" f"{self.flavour}/{self.uniq_key}"
+        return f"{self.databrowser_url}/data_search/{self.flavour}/{self.uniq_key}"
+
+    @property
+    def zarr_loader_url(self) -> str:
+        """Define the url for getting zarr files."""
+        return f"{self.databrowser_url}/load/{self.flavour}/"
+
+    @property
+    def intake_url(self) -> str:
+        """Define the url for creating intake catalogues."""
+        return f"{self.databrowser_url}/intake_catalogue/{self.flavour}/{self.uniq_key}"
 
     @property
     def metadata_url(self) -> str:
         """Define the endpoint for the metadata search."""
         return (
-            f"{self.databrowser_url}/metadata_search/" f"{self.flavour}/{self.uniq_key}"
+            f"{self.databrowser_url}/metadata_search/"
+            f"{self.flavour}/{self.uniq_key}"
         )
 
     @staticmethod
@@ -132,7 +149,7 @@ class Config:
         scheme = scheme or "http"
         return scheme, hostname
 
-    def get_databrowser_url(self, url: Optional[str]) -> str:
+    def get_api_url(self, url: Optional[str]) -> str:
         """Construct the databrowser url from a given hostname."""
         url = url or self._get_databrowser_host_from_config()
         scheme, hostname = self._split_url(url)
@@ -140,7 +157,7 @@ class Config:
         if port:
             hostname = f"{hostname}:{port}"
         hostname = hostname.partition("/")[0]
-        return f"{scheme}://{hostname}/api/databrowser"
+        return f"{scheme}://{hostname}/api"
 
     @staticmethod
     def get_dirs(user: bool = True) -> Path:

freva_client/utils/logger.py

@@ -21,10 +21,10 @@ logger_format = logging.Formatter(
 
 logger_stream_handle = RichHandler(
     rich_tracebacks=True,
-    show_path=True,
+    show_path=False,
     markup=True,
     log_time_format="[%Y-%m-%dT%H:%M:%S]",
-    console=Console(soft_wrap=True, stderr=True),
+    console=Console(soft_wrap=False, stderr=True),
 )
 logger_stream_handle.setLevel(logging.ERROR)
 logging.basicConfig(

{freva_client-2404.0.1.dist-info → freva_client-2408.0.0.dev2.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: freva-client
-Version: 2404.0.1
+Version: 2408.0.0.dev2
 Summary: Search for climate data based on key-value pairs
 Author-email: "DKRZ, Clint" <freva@dkrz.de>
 Requires-Python: >=3.8
@@ -18,7 +18,9 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Requires-Dist: appdirs
 Requires-Dist: pyyaml
+Requires-Dist: authlib
 Requires-Dist: requests
+Requires-Dist: intake_esm
 Requires-Dist: rich
 Requires-Dist: tomli
 Requires-Dist: typer

freva_client-2408.0.0.dev2.dist-info/RECORD

@@ -0,0 +1,19 @@
+freva_client/__init__.py,sha256=wewJE1Pd4LfDcnunOWIoFa4LldlxMdSvoQmFlCRvWHY,856
+freva_client/__main__.py,sha256=JVj12puT4o8JfhKLAggR2-NKCZa3wKwsYGi4HQ61DOQ,149
+freva_client/auth.py,sha256=80avhfDzZuDH7hxZuR5eHsbYU9OnMHrPbqqZbX13aLk,6517
+freva_client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+freva_client/query.py,sha256=VJHUxuESORsXgyqFs7xbCpoGjCmQikM3453yMtOEmFw,27950
+freva_client/cli/__init__.py,sha256=NgTqBZGdozmTZtJduJUMrZj-opGw2KoT20tg6sc_xqo,149
+freva_client/cli/auth_cli.py,sha256=_WaEL6iSeE2agv-G-qka-cC6UoedtfoCAC_Vqfk0jKw,1856
+freva_client/cli/cli_app.py,sha256=qiOm1-tak_dei4TNilZ09S5lowJ4DMw0mGYFH65zDpo,782
+freva_client/cli/cli_parser.py,sha256=c-_WG56g6arLvnayb9SO1OeHt7AjBV4egI_vTEYee4I,5042
+freva_client/cli/cli_utils.py,sha256=ygwkNYqnjYJFRQu1M0r1VFQLAAl5lT05bM4tVsR0Xpc,841
+freva_client/cli/databrowser_cli.py,sha256=kFu44cAzwQ-HLd--d649ER6BCCxjRt9LeJA7xgIBlJ4,20924
+freva_client/utils/__init__.py,sha256=ySHn-3CZBwfZW2s0EpZ3INxUWOw1V4LOlKIxSLYr52U,1000
+freva_client/utils/databrowser_utils.py,sha256=sPnPk8KgQSztfr7sDrBYillFiSzYIB5if66pv-VFR40,6380
+freva_client/utils/logger.py,sha256=xd_3jjbsD1UBWlZZe8OUtKLpG7lbLcH46yiJ_bftyKg,2464
+freva_client-2408.0.0.dev2.data/data/share/freva/freva.toml,sha256=64Rh4qvWc9TaGJMXMi8tZW14FnESt5Z24y17BfD2VyM,736
+freva_client-2408.0.0.dev2.dist-info/entry_points.txt,sha256=zGyEwHrH_kAGLsCXv00y7Qnp-WjXkUuIomHkfGMCxtA,53
+freva_client-2408.0.0.dev2.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
+freva_client-2408.0.0.dev2.dist-info/METADATA,sha256=5SnVCl-nKZL-BMuwmfQEx4YqyWY3XOmbKK1z6QDNBhI,2455
+freva_client-2408.0.0.dev2.dist-info/RECORD,,

freva_client-2404.0.1.dist-info/RECORD

@@ -1,16 +0,0 @@
-freva_client/__init__.py,sha256=G-ctas9phozvNBeV56A5lIRz5aphHL0hssBjuefvU3Y,804
-freva_client/__main__.py,sha256=JVj12puT4o8JfhKLAggR2-NKCZa3wKwsYGi4HQ61DOQ,149
-freva_client/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-freva_client/query.py,sha256=WE1g51ssTu2lsHVD5WR7w3Be952K0LVQOiYZ_fN-0gY,23388
-freva_client/cli/__init__.py,sha256=NgTqBZGdozmTZtJduJUMrZj-opGw2KoT20tg6sc_xqo,149
-freva_client/cli/cli_app.py,sha256=RUEjGpvZLPQE4lrxfUg9r71NeQ7XtZ2THNPwqhDOLQk,504
-freva_client/cli/cli_utils.py,sha256=9RzwQ51Z4vq6sWcKucUqNXOFWg9GeU5Pjesq3ojOlBs,5471
-freva_client/cli/databrowser_cli.py,sha256=Ldj8OBZ0MWMhJ7-7eu9wKs6CaTrreP8PKoYumKSOxng,15365
-freva_client/utils/__init__.py,sha256=g3-UbSpF5Z-EaDi1xJbOYvLqB1YfDyBvPTHWDIKpMvo,999
-freva_client/utils/databrowser_utils.py,sha256=TBTE1hZ7_wTydKV4fbiIm6A0cBwvYgZgvZdW9dmh6EE,5884
-freva_client/utils/logger.py,sha256=PiYIlW7z7dnrZ6f4DGuWU0Vu7pHg4QBGbpHNmoQX3mw,2462
-freva_client-2404.0.1.data/data/share/freva/freva.toml,sha256=64Rh4qvWc9TaGJMXMi8tZW14FnESt5Z24y17BfD2VyM,736
-freva_client-2404.0.1.dist-info/entry_points.txt,sha256=zGyEwHrH_kAGLsCXv00y7Qnp-WjXkUuIomHkfGMCxtA,53
-freva_client-2404.0.1.dist-info/WHEEL,sha256=EZbGkh7Ie4PoZfRQ8I0ZuP9VklN_TvcZ6DSE5Uar4z4,81
-freva_client-2404.0.1.dist-info/METADATA,sha256=-9SIyTizpDiOqhs76viVfAAn7RKUqjODBhHgchSRJEM,2401
-freva_client-2404.0.1.dist-info/RECORD,,