esgpull 0.7.1__py3-none-any.whl → 0.7.3__py3-none-any.whl

esgpull/cli/utils.py

@@ -15,7 +15,7 @@ from rich.text import Text
 from esgpull import Esgpull
 from esgpull.graph import Graph
 from esgpull.models import Dataset, File, Option, Options, Query, Selection
-from esgpull.tui import UI, TempUI, Verbosity
+from esgpull.tui import UI, TempUI, Verbosity, logger
 from esgpull.utils import format_size
 
 
@@ -121,9 +121,15 @@ def totable(docs: list[OrderedDict[str, Any]]) -> Table:
     return table
 
 
+def safe_value(value: str) -> str:
+    if " " in value:
+        return f'"{value}"'
+    else:
+        return value
+
+
 def parse_facets(facets: list[str]) -> Selection:
     facet_dict: dict[str, list[str]] = {}
-    exact_terms: list[str] | None = None
     for facet in facets:
         match facet.split(":"):
             case [value]:
@@ -132,28 +138,9 @@ def parse_facets(facets: list[str]) -> Selection:
                 ...
             case _:
                 raise BadArgumentUsage(f"{facet!r} is not valid syntax.")
-        if value.startswith("/"):
-            if exact_terms is not None:
-                raise BadArgumentUsage("Nested exact string is forbidden.")
-            exact_terms = []
-        if exact_terms is not None:
-            if name != "query":
-                raise BadArgumentUsage(
-                    "Cannot use facet term inside an exact string."
-                )
-            exact_terms.append(value)
-            if value.endswith("/"):
-                final_exact_str = " ".join(exact_terms)
-                value = '"' + final_exact_str.strip("/") + '"'
-                exact_terms = None
-            else:
-                continue
-            facet_dict.setdefault(name, [])
-            facet_dict[name].append(value)
-        else:
-            values = value.split(",")
-            facet_dict.setdefault(name, [])
-            facet_dict[name].extend(values)
+        values = list(map(safe_value, value.split(",")))
+        facet_dict.setdefault(name, [])
+        facet_dict[name].extend(values)
     selection = Selection()
     for name, values in facet_dict.items():
         selection[name] = values
@@ -170,6 +157,13 @@ def parse_query(
     replica: str | None,
     retracted: str | None,
 ) -> Query:
+    logger.info(f"{facets=}")
+    logger.info(f"{tags=}")
+    logger.info(f"{require=}")
+    logger.info(f"{distrib=}")
+    logger.info(f"{latest=}")
+    logger.info(f"{replica=}")
+    logger.info(f"{retracted=}")
     options = Options(
         distrib=distrib or Option.notset,
         latest=latest or Option.notset,

esgpull/context.py

@@ -1,6 +1,7 @@
 from __future__ import annotations
 
 import asyncio
+import json
 import sys
 from collections.abc import AsyncIterator, Callable, Coroutine, Sequence
 from dataclasses import dataclass, field
@@ -441,7 +442,9 @@ class Context:
             try:
                 resp = await self.client.send(result.request)
                 resp.raise_for_status()
-                result.json = resp.json()
+                result.json = json.loads(
+                    resp.content.decode(encoding="latin-1")
+                )
                 logger.info(f"✓ Fetched in {resp.elapsed}s {resp.url}")
             except HTTPError as exc:
                 result.exc = exc
@@ -464,6 +467,8 @@ class Context:
             group = BaseExceptionGroup("fetch", excs)
             if self.noraise:
                 logger.exception(group)
+                for exc in excs:
+                    logger.exception(exc)
             else:
                 raise group
 

esgpull/migrations/versions/0.7.2_update_tables.py

@@ -0,0 +1,28 @@
+"""update tables
+
+Revision ID: 0.7.2
+Revises: 0.7.1
+Create Date: 2024-09-17 15:04:11.203421
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '0.7.2'
+down_revision = '0.7.1'
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###

esgpull/migrations/versions/0.7.3_update_tables.py

@@ -0,0 +1,28 @@
+"""update tables
+
+Revision ID: 0.7.3
+Revises: 0.7.2
+Create Date: 2024-09-20 12:22:11.989996
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '0.7.3'
+down_revision = '0.7.2'
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    pass
+    # ### end Alembic commands ###

{esgpull-0.7.1.dist-info → esgpull-0.7.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: esgpull
-Version: 0.7.1
+Version: 0.7.3
 Summary: ESGF data discovery, download, replication tool
 Project-URL: Repository, https://github.com/ESGF/esgf-download
 Project-URL: Documentation, https://esgf.github.io/esgf-download/
@@ -60,6 +60,18 @@ for dataset in datasets:
 - Command-line interface
 - HTTP download (async multi-file)
 
+## Installation
+
+Install `esgpull` using pip or conda:
+
+```shell
+pip install esgpull
+```
+
+```shell
+conda install -c conda-forge ipsl::esgpull
+```
+
 ## Usage
 
 ```console

{esgpull-0.7.1.dist-info → esgpull-0.7.3.dist-info}/RECORD

@@ -2,7 +2,7 @@ esgpull/__init__.py,sha256=XItFDIMNmFUNNcKtUgXdfmGwUIWt4AAv0a4mZkfj5P8,240
 esgpull/auth.py,sha256=QZ-l1ySLMP0fvuwYHRLv9FZYp1gqfju_eGaTMDByUxw,5205
 esgpull/config.py,sha256=3E3jRGem09M_Hm1_uqWHu4dy7gzgShiUecZp-6XC9E4,12149
 esgpull/constants.py,sha256=fQE6vE2EU8V5m2lRNYBeMkL3u1_Em343Zs8u7i6ZRlo,1118
-esgpull/context.py,sha256=oSymljW0hZLGhCJxo7lh96Eq3SI_KOT_jFMPHckIrm0,23203
+esgpull/context.py,sha256=ZywqCvIKZrW1pJln04993yxT6dW8yJ7fnx6LJL7Ot0E,23368
 esgpull/database.py,sha256=TDo5xIXWyMEPFpaeygVhLZkeDAwYlkBG9UWhmL6ntfo,6144
 esgpull/download.py,sha256=3YcGLrffzAmuiV49tYsW-7PuVYcSFtbsZnH2Q26khm0,5491
 esgpull/esgpull.py,sha256=R7lnlyOo92FB_Qem5ST4hNA5Iwn9PHYsvCpKxqRX-qM,17717
@@ -36,7 +36,7 @@ esgpull/cli/show.py,sha256=4O1TvH31x9Fg-SI0a8dtblMZuJHJ30eBXOV9bwEl9Lk,1897
 esgpull/cli/status.py,sha256=jgGBbmvcCjw21QTDNXdKAUo664p6junRg5kMwQ7My2I,2470
 esgpull/cli/track.py,sha256=Q9ZvvV5FFGzp6wQZflAd_OFmqhAWgl1JFBad2dCbEF0,3089
 esgpull/cli/update.py,sha256=x_R4x7hdUp5qowcFUibIMozwWTlJybuZMY_EXWhj_kI,7024
-esgpull/cli/utils.py,sha256=mMCVUuHEG1g3KPGq_Jx1p1AfJCVFwxR23GsQRtV88xA,7262
+esgpull/cli/utils.py,sha256=tTmEiti8UgBYf_eWUozGjCGCGIJ-mPPXGwBf0jK8wuQ,6826
 esgpull/migrations/README,sha256=heMzebYwlGhnE8_4CWJ4LS74WoEZjBy-S-mIJRxAEKI,39
 esgpull/migrations/env.py,sha256=am2HhFrlIZNlXCaA5Ye7yKbIJ2MRSO5UFmUwB8l9fyE,2285
 esgpull/migrations/script.py.mako,sha256=HNlf26BI1xvQKjiUojnj15BPrVUfVVr81IOgliJf83c,510
@@ -64,6 +64,8 @@ esgpull/migrations/versions/0.6.4_update_tables.py,sha256=PFALlSAjCFOqqoQgjq2TF0
 esgpull/migrations/versions/0.6.5_update_tables.py,sha256=NYO8vnS4h_g4Co4M1CJibB2WYLqmVAy6ZaApFk-do3c,493
 esgpull/migrations/versions/0.7.0_update_tables.py,sha256=aCmR7q-1V49JIfvFR-1iVskTwR3J8O1iKysgF0oJZ4k,971
 esgpull/migrations/versions/0.7.1_update_tables.py,sha256=f_PakdA0ZKmekcWWDC86u5PlUrF_Kl2xzkNV3Am9sd0,541
+esgpull/migrations/versions/0.7.2_update_tables.py,sha256=cBWEhfYQlhGpE55NOY9eD2psIb3HS7KOa9g-_3y0nQA,541
+esgpull/migrations/versions/0.7.3_update_tables.py,sha256=4pNkM7VaGQqkLuIoLKuM0ftefLjDBVFRaV8Nkq5OL-Y,541
 esgpull/models/__init__.py,sha256=rfa1yGLVDahFrnhq_8TPGzr7_oeBOFKNVD9EF0slUtY,725
 esgpull/models/base.py,sha256=3nbR2lYMHWfovWz4EiAJ2bIvKpMadRvYZDdMRQDvN7M,1237
 esgpull/models/dataset.py,sha256=1fOIVYIWKK5BivqvBpjfxrNpy9VfUHZng9Yc6ipPK1Q,905
@@ -76,8 +78,8 @@ esgpull/models/sql.py,sha256=Wlw9cGJ_buv51qC0grV8HvprEwoG92e2zagxkQXKosk,7481
 esgpull/models/synda_file.py,sha256=6o5unPhzVJGnbpA2MxcS0r-hrBwocHYVnLrqjSGtmuk,2387
 esgpull/models/tag.py,sha256=5CQDB9rAeCqog63ec9LPFN46HOFNkHPy-maY4gkBQ3E,461
 esgpull/models/utils.py,sha256=exwlIlIKYjhhfUE82w1kU_HeSQOSY97PTvpkhW0udMA,1631
-esgpull-0.7.1.dist-info/METADATA,sha256=1igfjfbOvh_U8yLbJbv027Q2t4Ft5NteUGnOSleOMPA,3052
-esgpull-0.7.1.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
-esgpull-0.7.1.dist-info/entry_points.txt,sha256=vyh7HvFrCp4iyMrTkDoSF3weaYrlNj2OJe0Fq5q4QB4,45
-esgpull-0.7.1.dist-info/licenses/LICENSE,sha256=lUqGPGWDHHxjkUDuYgjLLY2XQXXn_EHU7fnrQWHGugc,1540
-esgpull-0.7.1.dist-info/RECORD,,
+esgpull-0.7.3.dist-info/METADATA,sha256=3QSuofTjEamQ7oc5Idx8N5qRswwRLxz5IaLvVfZyYU8,3199
+esgpull-0.7.3.dist-info/WHEEL,sha256=1yFddiXMmvYK7QYTqtRNtX66WJ0Mz8PYEiEUoOUUxRY,87
+esgpull-0.7.3.dist-info/entry_points.txt,sha256=vyh7HvFrCp4iyMrTkDoSF3weaYrlNj2OJe0Fq5q4QB4,45
+esgpull-0.7.3.dist-info/licenses/LICENSE,sha256=lUqGPGWDHHxjkUDuYgjLLY2XQXXn_EHU7fnrQWHGugc,1540
+esgpull-0.7.3.dist-info/RECORD,,