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

esgpull/cli/__init__.py

@@ -7,6 +7,7 @@ from esgpull import __version__
 from esgpull.cli.add import add
 from esgpull.cli.config import config
 from esgpull.cli.convert import convert
+from esgpull.cli.datasets import datasets
 from esgpull.cli.download import download
 from esgpull.cli.login import login
 from esgpull.cli.remove import remove
@@ -34,6 +35,7 @@ SUBCOMMANDS: list[click.Command] = [
     # autoremove,
     config,
     convert,
+    datasets,
     download,
     # facet,
     # get,

esgpull/cli/add.py

@@ -21,20 +21,22 @@ from esgpull.tui import Verbosity
 @groups.query_def
 @opts.query_file
 @opts.track
+@opts.no_default_query
 @opts.record
 @opts.verbosity
 def add(
     facets: list[str],
-    # query options
+    ## query_def
     tags: list[str],
     require: str | None,
     distrib: str | None,
     latest: str | None,
     replica: str | None,
     retracted: str | None,
-    # since: str | None,
+    ## ungrouped
     query_file: Path | None,
     track: bool,
+    no_default_query: bool,
     record: bool,
     verbosity: Verbosity,
 ) -> None:
@@ -55,7 +57,11 @@ def add(
 
     To fetch files from ESGF and link them to a query, see the `track` and `update` commands.
     """
-    esg = init_esgpull(verbosity, record=record)
+    esg = init_esgpull(
+        verbosity,
+        record=record,
+        no_default_query=no_default_query,
+    )
     with esg.ui.logging("add", onraise=Abort):
         if query_file is not None:
             queries = serialize_queries_from_file(query_file)
@@ -77,6 +83,7 @@ def add(
                     expanded = query
                 query.track(expanded.options)
             queries = [query]
+        queries = esg.insert_default_query(*queries)
         subgraph = Graph(None)
         subgraph.add(*queries)
         esg.ui.print(subgraph)

esgpull/cli/datasets.py

@@ -0,0 +1,78 @@
+from collections import defaultdict
+from dataclasses import dataclass
+
+import click
+from click.exceptions import Abort, Exit
+from rich.box import MINIMAL_DOUBLE_HEAD
+from rich.table import Table
+
+from esgpull.cli.decorators import args, groups, opts
+from esgpull.cli.utils import init_esgpull, valid_name_tag
+from esgpull.models import FileStatus
+from esgpull.tui import Verbosity
+
+
+@dataclass
+class DatasetCounter:
+    done: int = 0
+    total: int = 0
+
+    def is_complete(self) -> int:
+        return self.done == self.total
+
+    def asdict(self) -> dict:
+        return {
+            "done": self.done,
+            "total": self.total,
+            "complete": self.is_complete(),
+        }
+
+
+@click.command()
+@args.query_id_required
+@groups.json_yaml
+@opts.verbosity
+def datasets(
+    query_id: str,
+    json: bool,
+    yaml: bool,
+    verbosity: Verbosity,
+):
+    """
+    View datasets completeness per query.
+    """
+    esg = init_esgpull(verbosity)
+    with esg.ui.logging("datasets", onraise=Abort):
+        if not valid_name_tag(esg.graph, esg.ui, query_id, None):
+            raise Exit(1)
+        query = esg.graph.get(query_id)
+        datasets: defaultdict[str, DatasetCounter] = defaultdict(
+            DatasetCounter
+        )
+        for file in query.files:
+            datasets[file.dataset_id].total += 1
+            if file.status == FileStatus.Done:
+                datasets[file.dataset_id].done += 1
+        if json or yaml:
+            datasets_dict = {
+                dataset_id: counts.asdict()
+                for dataset_id, counts in datasets.items()
+            }
+            if json:
+                esg.ui.print(datasets_dict, json=True)
+            elif yaml:
+                esg.ui.print(datasets_dict, yaml=True)
+        else:
+            table = Table(box=MINIMAL_DOUBLE_HEAD, show_edge=False)
+            table.add_column("dataset_id", justify="right", style="bold blue")
+            table.add_column("done", justify="center")
+            table.add_column("total", justify="center")
+            table.add_column("complete", justify="center")
+            for dataset_id, counts in datasets.items():
+                table.add_row(
+                    dataset_id,
+                    str(counts.done),
+                    str(counts.total),
+                    str(counts.is_complete()),
+                )
+            esg.ui.print(table)

esgpull/cli/decorators.py

@@ -59,6 +59,12 @@ class args:
         nargs=1,
         required=False,
     )
+    query_id_required: Dec = click.argument(
+        "query_id",
+        type=str,
+        nargs=1,
+        required=True,
+    )
     query_ids: Dec = click.argument(
         "query_ids",
         type=str,
@@ -143,6 +149,11 @@ class opts:
         type=str,
         default=None,
     )
+    no_default_query: Dec = click.option(
+        "--no-default-query",
+        is_flag=True,
+        default=False,
+    )
     query_file: Dec = click.option(
         "--query-file",
         "-q",

esgpull/cli/search.py

@@ -18,17 +18,17 @@ from esgpull.tui import Verbosity
 @groups.query_def
 @groups.query_date
 @groups.display
+@groups.json_yaml
+@opts.detail
+@opts.no_default_query
+@opts.show
 @opts.dry_run
 @opts.file
 @opts.facets_hints
 @opts.hints
-@groups.json_yaml
-@opts.detail
-@opts.show
 @opts.yes
 @opts.record
 @opts.verbosity
-# @opts.selection_file
 def search(
     facets: list[str],
     ## query_def
@@ -38,6 +38,7 @@ def search(
     latest: str | None,
     replica: str | None,
     retracted: str | None,
+    ## query_date
     date_from: datetime | None,
     date_to: datetime | None,
     ## display
@@ -48,14 +49,14 @@ def search(
     json: bool,
     yaml: bool,
     ## ungrouped
-    show: bool,
     detail: int | None,
+    no_default_query: bool,
+    show: bool,
     dry_run: bool,
     file: bool,
     facets_hints: bool,
     hints: list[str] | None,
     yes: bool,
-    # selection_file: str | None,
     record: bool,
     verbosity: Verbosity,
 ) -> None:
@@ -64,7 +65,12 @@ def search(
 
     More info
     """
-    esg = init_esgpull(verbosity, safe=False, record=record)
+    esg = init_esgpull(
+        verbosity,
+        safe=False,
+        record=record,
+        no_default_query=no_default_query,
+    )
     with esg.ui.logging("search", onraise=Abort):
         query = parse_query(
             facets=facets,
@@ -77,6 +83,7 @@ def search(
         )
         query.compute_sha()
         esg.graph.resolve_require(query)
+        query = esg.insert_default_query(query)[0]
         if show:
             if json:
                 esg.ui.print(query.asdict(), json=True)

esgpull/cli/update.py

@@ -165,20 +165,23 @@ def update(
             if choice == "y":
                 legacy = esg.legacy_query
                 has_legacy = legacy.state.persistent
-                for file in new_files:
-                    file_db = esg.db.get(File, file.sha)
-                    if file_db is None:
-                        if esg.db.has_file_id(file):
-                            logger.error(
-                                "File id already exists in database, "
-                                "there might be an error with its checksum"
-                                f"\n{file}"
-                            )
-                            continue
-                        file.status = FileStatus.Queued
-                        file_db = esg.db.merge(file)
-                    elif has_legacy and legacy in file_db.queries:
-                        file_db.queries.remove(legacy)
-                    file_db.queries.append(qf.query)
-                    esg.db.add(file_db)
+                with esg.db.commit_context():
+                    for file in esg.ui.track(
+                        new_files,
+                        description=qf.query.rich_name,
+                    ):
+                        file_db = esg.db.get(File, file.sha)
+                        if file_db is None:
+                            if esg.db.has_file_id(file):
+                                logger.error(
+                                    "File id already exists in database, "
+                                    "there might be an error with its checksum"
+                                    f"\n{file}"
+                                )
+                                continue
+                            file.status = FileStatus.Queued
+                            esg.db.session.add(file)
+                        elif has_legacy and legacy in file_db.queries:
+                            esg.db.unlink(query=legacy, file=file_db)
+                        esg.db.link(query=qf.query, file=file)
         esg.ui.raise_maybe_record(Exit(0))

esgpull/cli/utils.py

@@ -1,8 +1,9 @@
 import sys
 from collections import OrderedDict
+from collections.abc import MutableMapping, Sequence
 from enum import Enum
 from pathlib import Path
-from typing import Any, Literal, MutableMapping, Sequence
+from typing import Any, Literal
 
 import click
 import yaml
@@ -29,6 +30,7 @@ def init_esgpull(
     safe: bool = True,
     record: bool = False,
     load_db: bool = True,
+    no_default_query: bool = False,
 ) -> Esgpull:
     TempUI.verbosity = Verbosity.Errors
     with TempUI.logging():
@@ -38,6 +40,8 @@ def init_esgpull(
             record=record,
             load_db=load_db,
         )
+        if no_default_query:
+            esg.config.api.default_query_id = ""
         if record:
             esg.ui.print(get_command())
     return esg

esgpull/config.py

@@ -1,13 +1,14 @@
 from __future__ import annotations
 
 import logging
-from collections.abc import Container, Iterator, Mapping
+from collections.abc import Iterator, Mapping
 from enum import Enum, auto
 from pathlib import Path
 from typing import Any, cast
 
 import tomlkit
-from attrs import Factory, define, field
+from attrs import Factory, define, field, fields
+from attrs import has as attrs_has
 from cattrs import Converter
 from cattrs.gen import make_dict_unstructure_fn, override
 from tomlkit import TOMLDocument
@@ -98,6 +99,7 @@ class Download:
     max_concurrent: int = 5
     disable_ssl: bool = False
     disable_checksum: bool = False
+    show_filename: bool = False
 
 
 @define
@@ -123,6 +125,7 @@ class API:
     max_concurrent: int = 5
     page_limit: int = 50
     default_options: DefaultOptions = Factory(DefaultOptions)
+    default_query_id: str = ""
 
 
 def fix_rename_search_api(doc: TOMLDocument) -> TOMLDocument:
@@ -298,15 +301,29 @@ class Config:
             doc.setdefault(part, {})
             doc = doc[part]
             obj = getattr(obj, part)
+        value_type = getattr(fields(type(obj)), last).type
         old_value = getattr(obj, last)
-        if isinstance(old_value, str):
-            ...
-        elif isinstance(old_value, Container):
+        if attrs_has(value_type):
             raise KeyError(key)
-        try:
-            value = int(value)
-        except ValueError:
+        elif value_type is str:
             ...
+        elif value_type is int:
+            try:
+                value = value_type(value)
+            except Exception:
+                ...
+        elif value_type is bool:
+            if isinstance(value, bool):
+                ...
+            elif isinstance(value, str):
+                if value.lower() in ["on", "true"]:
+                    value = True
+                elif value.lower() in ["off", "false"]:
+                    value = False
+                else:
+                    raise ValueError(value)
+            else:
+                raise TypeError(value)
         setattr(obj, last, value)
         doc[last] = value
         return old_value

esgpull/constants.py

@@ -1,4 +1,5 @@
 CONFIG_FILENAME = "config.toml"
+INSTALLS_PATH_ENV = "ESGPULL_INSTALLS_PATH"
 ROOT_ENV = "ESGPULL_CURRENT"
 
 IDP = "/esgf-idp/openid/"

esgpull/database.py

@@ -16,11 +16,10 @@ from sqlalchemy.orm import Session, joinedload, make_transient
 
 from esgpull import __file__
 from esgpull.config import Config
-from esgpull.models import File, Table, sql
+from esgpull.models import File, Query, Table, sql
 from esgpull.version import __version__
 
 # from esgpull.exceptions import NoClauseError
-# from esgpull.models import Query
 
 T = TypeVar("T")
 
@@ -42,8 +41,16 @@ class Database:
         url = f"sqlite:///{config.paths.db / config.db.filename}"
         return Database(url, run_migrations=run_migrations)
 
+    def _setup_sqlite(self, conn, record):
+        cursor = conn.cursor()
+        cursor.execute("PRAGMA journal_mode = WAL;")
+        cursor.execute("PRAGMA synchronous = NORMAL;")
+        cursor.execute("PRAGMA cache_size = 20000;")
+        cursor.close()
+
     def __post_init__(self, run_migrations: bool) -> None:
         self._engine = sa.create_engine(self.url)
+        sa.event.listen(self._engine, "connect", self._setup_sqlite)
         self.session = Session(self._engine)
         if run_migrations:
             self._update()
@@ -59,10 +66,10 @@ class Database:
             opts = {"version_table": "version"}
             ctx = MigrationContext.configure(conn, opts=opts)
             self.version = ctx.get_current_revision()
-        if self.version != head:
-            alembic.command.upgrade(alembic_config, __version__)
+        if head is not None and self.version != head:
+            alembic.command.upgrade(alembic_config, head)
             self.version = head
-        if self.version != __version__:
+        if "+dev" not in __version__ and self.version != __version__:
             alembic.command.revision(
                 alembic_config,
                 message="update tables",
@@ -80,6 +87,12 @@ class Database:
             self.session.rollback()
             raise
 
+    @contextmanager
+    def commit_context(self) -> Iterator[None]:
+        with self.safe:
+            yield
+            self.session.commit()
+
     def get(
         self,
         table: type[Table],
@@ -132,6 +145,12 @@ class Database:
         for item in items:
             make_transient(item)
 
+    def link(self, query: Query, file: File):
+        self.session.execute(sql.query_file.link(query, file))
+
+    def unlink(self, query: Query, file: File):
+        self.session.execute(sql.query_file.unlink(query, file))
+
     def __contains__(self, item: Table) -> bool:
         return self.scalars(sql.count(item))[0] > 0
 

esgpull/esgpull.py

@@ -13,6 +13,7 @@ from rich.progress import (
     DownloadColumn,
     MofNCompleteColumn,
     Progress,
+    ProgressColumn,
     SpinnerColumn,
     TaskID,
     TextColumn,
@@ -28,6 +29,7 @@ from esgpull.exceptions import (
     DownloadCancelled,
     InvalidInstallPath,
     NoInstallPath,
+    UnknownDefaultQueryID,
 )
 from esgpull.fs import Filesystem
 from esgpull.graph import Graph
@@ -337,7 +339,10 @@ class Esgpull:
                                 data_node = (
                                     f"[blue]{task.fields['data_node']}[/]"
                                 )
-                                msg = " · ".join([sha, size, speed, data_node])
+                                parts = [sha, size, speed, data_node]
+                                if self.config.download.show_filename:
+                                    parts.append(task.fields["filename"])
+                                msg = " · ".join(parts)
                                 logger.info(msg)
                                 live.console.print(msg)
                                 yield result
@@ -366,7 +371,7 @@ class Esgpull:
             MofNCompleteColumn(),
             TimeRemainingColumn(compact=True, elapsed_when_finished=True),
         )
-        file_progress = self.ui.make_progress(
+        file_columns: list[str | ProgressColumn] = [
             TextColumn("[cyan][{task.id}] [b blue]{task.fields[sha]}"),
             "[progress.percentage]{task.percentage:>3.0f}%",
             BarColumn(),
@@ -376,6 +381,16 @@ class Esgpull:
             TransferSpeedColumn(),
             "·",
             TextColumn("[blue]{task.fields[data_node]}"),
+        ]
+        if self.config.download.show_filename:
+            file_columns.extend(
+                [
+                    "·",
+                    TextColumn("{task.fields[filename]}"),
+                ]
+            )
+        file_progress = self.ui.make_progress(
+            *file_columns,
             transient=True,
         )
         file_task_shas = {}
@@ -387,6 +402,7 @@ class Esgpull:
                 visible=False,
                 start=False,
                 sha=short_sha(file.sha),
+                filename=file.filename,
                 data_node=file.data_node,
             )
             callback = partial(file_progress.start_task, task_id)
@@ -445,3 +461,31 @@ class Esgpull:
                 if use_db:
                     self.db.add(*cancelled)
         return files, errors
+
+    def replace_queries(
+        self,
+        graph: Graph,
+        mapping: tuple[str | None, str],
+    ) -> None:
+        to_replace = [
+            q for q in graph.queries.values() if q.require == mapping[0]
+        ]
+        for query in to_replace:
+            new_query = query.clone(compute_sha=False)
+            new_query.require = mapping[1]
+            new_query.compute_sha()
+            graph.replace(query, new_query)
+            self.replace_queries(graph, (query.sha, new_query.sha))
+
+    def insert_default_query(self, *queries: Query) -> list[Query]:
+        if self.config.api.default_query_id == "":
+            return list(queries)
+        default_query_id = self.config.api.default_query_id
+        try:
+            default_query = self.graph.get(default_query_id)
+        except KeyError:
+            raise UnknownDefaultQueryID(default_query_id)
+        graph = Graph(None)
+        graph.add(*queries)
+        self.replace_queries(graph, (None, default_query.sha))
+        return list(graph.queries.values())

esgpull/exceptions.py

@@ -109,8 +109,11 @@ class VirtualConfigError(EsgpullException):
     """
 
 
-class InstallException(EsgpullException):
-    ...
+class InstallException(EsgpullException): ...
+
+
+class UnknownDefaultQueryID(EsgpullException):
+    msg = "{}"
 
 
 class UntrackableQuery(EsgpullException):

esgpull/install_config.py

@@ -8,7 +8,7 @@ from pathlib import Path
 import platformdirs
 from typing_extensions import NotRequired, TypedDict
 
-from esgpull.constants import ROOT_ENV
+from esgpull.constants import INSTALLS_PATH_ENV, ROOT_ENV
 from esgpull.exceptions import AlreadyInstalledName, AlreadyInstalledPath
 
 
@@ -45,7 +45,15 @@ class _InstallConfig:
     installs: list[Install]
 
     def __init__(self) -> None:
-        user_config_dir = platformdirs.user_config_path("esgpull")
+        self.setup()
+
+    def setup(self, install_path: Path | None = None):
+        if install_path is not None:
+            user_config_dir = install_path
+        elif (env := os.environ.get(INSTALLS_PATH_ENV)) is not None:
+            user_config_dir = Path(env)
+        else:
+            user_config_dir = platformdirs.user_config_path("esgpull")
         self.path = user_config_dir / "installs.json"
         if self.path.is_file():
             with self.path.open() as f:

esgpull/migrations/env.py

@@ -43,8 +43,10 @@ def run_migrations_offline() -> None:
         url=url,
         target_metadata=target_metadata,
         literal_binds=True,
+        dialect_name="sqlite",
         dialect_opts={"paramstyle": "named"},
         version_table="version",
+        render_as_batch=True,
     )
 
     with context.begin_transaction():
@@ -70,6 +72,7 @@ def run_migrations_online() -> None:
             connection=connection,
             target_metadata=target_metadata,
             version_table="version",
+            render_as_batch=True,
         )
 
         with context.begin_transaction():

esgpull/migrations/versions/0.6.5_update_tables.py

@@ -0,0 +1,25 @@
+"""update tables
+
+Revision ID: 0.6.5
+Revises: 0.6.4
+Create Date: 2024-07-09 16:29:09.389585
+
+"""
+
+# revision identifiers, used by Alembic.
+revision = "0.6.5"
+down_revision = "0.6.4"
+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.0_update_tables.py

@@ -0,0 +1,38 @@
+"""update tables
+
+Revision ID: 0.7.0
+Revises: 0.6.5
+Create Date: 2024-09-12 16:32:48.745570
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '0.7.0'
+down_revision = '0.6.5'
+branch_labels = None
+depends_on = None
+
+
+def upgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('file', schema=None) as batch_op:
+        batch_op.alter_column('size',
+               existing_type=sa.INTEGER(),
+               type_=sa.BigInteger(),
+               existing_nullable=False)
+
+    # ### end Alembic commands ###
+
+
+def downgrade() -> None:
+    # ### commands auto generated by Alembic - please adjust! ###
+    with op.batch_alter_table('file', schema=None) as batch_op:
+        batch_op.alter_column('size',
+               existing_type=sa.BigInteger(),
+               type_=sa.INTEGER(),
+               existing_nullable=False)
+
+    # ### end Alembic commands ###

esgpull/migrations/versions/0.7.1_update_tables.py

@@ -0,0 +1,28 @@
+"""update tables
+
+Revision ID: 0.7.1
+Revises: 0.7.0
+Create Date: 2024-09-12 17:00:21.157499
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '0.7.1'
+down_revision = '0.7.0'
+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/models/query.py

@@ -235,7 +235,7 @@ class Query(Base):
             return nb_files is not None and nb_files > 0
 
     def files_count_size(self, *status: FileStatus) -> tuple[int, int]:
-        stmt: sa.Select[tuple[int, int | None]] = (
+        stmt: sa.Select[tuple[int, int]] = (
             sa.select(sa.func.count("*"), sa.func.sum(File.size))
             .join_from(query_file_proxy, File)
             .where(query_file_proxy.c.query_sha == self.sha)

esgpull/models/selection.py

@@ -71,6 +71,10 @@ class Selection(Base):
 
         setattr(cls, name, property(getter, setter))
 
+    @classmethod
+    def reset(cls) -> None:
+        cls.configure(*DefaultFacets, *BaseFacets, replace=True)
+
     @classmethod
     def configure(cls, *names: str, replace: bool = True) -> None:
         nameset = set(names) | {f"!{name}" for name in names}
@@ -195,7 +199,8 @@ BaseFacets = [
     "member_id",
     "cmor_table",
     "grid_label",
+    "nominal_resolution",
 ]
 
 
-Selection.configure(*DefaultFacets, *BaseFacets, replace=True)
+Selection.reset()

esgpull/models/sql.py

@@ -217,9 +217,7 @@ class selection:
     @functools.cache
     def orphans() -> sa.Select[tuple[Selection]]:
         return (
-            sa.select(Selection)
-            .outerjoin(Query)
-            .where(Query.sha == None)  # noqa
+            sa.select(Selection).outerjoin(Query).where(Query.sha == None)  # noqa
         )
 
 
@@ -256,3 +254,19 @@ class synda_file:
     @staticmethod
     def with_ids(*ids: int) -> sa.Select[tuple[SyndaFile]]:
         return sa.select(SyndaFile).where(SyndaFile.file_id.in_(ids))
+
+
+class query_file:
+    @staticmethod
+    def link(query: Query, file: File) -> sa.Insert:
+        return sa.insert(query_file_proxy).values(
+            query_sha=query.sha, file_sha=file.sha
+        )
+
+    @staticmethod
+    def unlink(query: Query, file: File) -> sa.Delete:
+        return (
+            sa.delete(query_file_proxy)
+            .where(query_file_proxy.c.query_sha == query.sha)
+            .where(query_file_proxy.c.file_sha == file.sha)
+        )

esgpull/tui.py

@@ -71,8 +71,7 @@ class DummyLive:
     def __enter__(self) -> DummyLive:
         return self
 
-    def __exit__(self, *args):
-        ...
+    def __exit__(self, *args): ...
 
     @property
     def console(self) -> DummyConsole:
@@ -259,9 +258,9 @@ class UI:
         # use _console to avoid recording the progress bar
         return Live(renderables, console=_console)
 
-    def track(self, iterable: Iterable[T]) -> Iterable[T]:
+    def track(self, iterable: Iterable[T], **kwargs) -> Iterable[T]:
         # use _console to avoid recording the progress bar
-        return track(iterable, console=_console)
+        return track(iterable, console=_console, **kwargs)
 
     def make_progress(
         self,

esgpull/version.py

@@ -1 +1,3 @@
-__version__ = "0.6.4"
+import importlib.metadata
+
+__version__ = importlib.metadata.version(__package__ or __name__)

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

@@ -1,63 +1,42 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: esgpull
-Version: 0.6.4
+Version: 0.7.1
 Summary: ESGF data discovery, download, replication tool
-Author-Email: Sven Rodriguez <srodriguez@ipsl.fr>
-License: BSD 3-Clause License
-        
-        Copyright (c) 2023, Institut Pierre-Simon Laplace (IPSL) and contributors
-        
-        Redistribution and use in source and binary forms, with or without
-        modification, are permitted provided that the following conditions are met:
-        
-        1. Redistributions of source code must retain the above copyright notice, this
-           list of conditions and the following disclaimer.
-        
-        2. Redistributions in binary form must reproduce the above copyright notice,
-           this list of conditions and the following disclaimer in the documentation
-           and/or other materials provided with the distribution.
-        
-        3. Neither the name of the copyright holder nor the names of its
-           contributors may be used to endorse or promote products derived from
-           this software without specific prior written permission.
-        
-        THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
-        AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-        IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
-        DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
-        FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-        DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
-        SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
-        CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
-        OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
-        OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 Project-URL: Repository, https://github.com/ESGF/esgf-download
 Project-URL: Documentation, https://esgf.github.io/esgf-download/
+Author-email: Sven Rodriguez <srodriguez@ipsl.fr>
+License: BSD-3-Clause
+License-File: LICENSE
+Classifier: License :: OSI Approved :: BSD License
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
 Requires-Python: >=3.10
-Requires-Dist: MyProxyClient>=2.1.0
 Requires-Dist: aiofiles>=22.1.0
+Requires-Dist: aiostream>=0.4.5
 Requires-Dist: alembic>=1.8.1
-Requires-Dist: click>=8.1.3
+Requires-Dist: attrs>=22.1.0
+Requires-Dist: cattrs>=22.2.0
 Requires-Dist: click-params>=0.4.0
+Requires-Dist: click>=8.1.3
 Requires-Dist: httpx>=0.23.0
+Requires-Dist: myproxyclient>=2.1.0
 Requires-Dist: nest-asyncio>=1.5.6
-Requires-Dist: pyOpenSSL>=22.1.0
+Requires-Dist: platformdirs>=2.6.2
+Requires-Dist: pyopenssl>=22.1.0
+Requires-Dist: pyparsing>=3.0.9
 Requires-Dist: pyyaml>=6.0
-Requires-Dist: tomlkit>=0.11.5
 Requires-Dist: rich>=12.6.0
-Requires-Dist: sqlalchemy>=2.0.0b2
 Requires-Dist: setuptools>=65.4.1
-Requires-Dist: aiostream>=0.4.5
-Requires-Dist: attrs>=22.1.0
-Requires-Dist: cattrs>=22.2.0
-Requires-Dist: platformdirs>=2.6.2
-Requires-Dist: pyparsing>=3.0.9
+Requires-Dist: sqlalchemy>=2.0.0b2
+Requires-Dist: tomlkit>=0.11.5
 Description-Content-Type: text/markdown
 
-[![pdm-managed](https://img.shields.io/badge/pdm-managed-blueviolet)](https://pdm.fming.dev)
-
 # esgpull - ESGF data management utility
 
+[![Rye](https://img.shields.io/endpoint?url=https://raw.githubusercontent.com/astral-sh/rye/main/artwork/badge.json)](https://rye.astral.sh)
+
 `esgpull` is a tool that simplifies usage of the [ESGF Search API](https://esgf.github.io/esg-search/ESGF_Search_RESTful_API.html) for data discovery, and manages procedures related to downloading and storing files from ESGF.
 
 ```py

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

@@ -1,15 +1,28 @@
-esgpull-0.6.4.dist-info/METADATA,sha256=SsHJeynCInwtASL4sPMRytgrzjd6ZKkMj_ibmMDBudY,4473
-esgpull-0.6.4.dist-info/WHEEL,sha256=mbxFTmdEUhG7evcdMkR3aBt9SWcoFBJ4CDwnfguNegA,90
-esgpull-0.6.4.dist-info/entry_points.txt,sha256=nfKsESeZyCiVD6dDCTCturf-vRnI-6GCuwqv9jxXCq8,46
-esgpull-0.6.4.dist-info/licenses/LICENSE,sha256=lUqGPGWDHHxjkUDuYgjLLY2XQXXn_EHU7fnrQWHGugc,1540
 esgpull/__init__.py,sha256=XItFDIMNmFUNNcKtUgXdfmGwUIWt4AAv0a4mZkfj5P8,240
 esgpull/auth.py,sha256=QZ-l1ySLMP0fvuwYHRLv9FZYp1gqfju_eGaTMDByUxw,5205
-esgpull/cli/__init__.py,sha256=boqxa_ku266IcZ6GY-7fVA2T9GLku1e01TXe3aqZmR4,1630
-esgpull/cli/add.py,sha256=c-tYR8h5OlSiavSiDzpUa5gIhBPzIPV9P7M2UvHOptc,3111
+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/database.py,sha256=TDo5xIXWyMEPFpaeygVhLZkeDAwYlkBG9UWhmL6ntfo,6144
+esgpull/download.py,sha256=3YcGLrffzAmuiV49tYsW-7PuVYcSFtbsZnH2Q26khm0,5491
+esgpull/esgpull.py,sha256=R7lnlyOo92FB_Qem5ST4hNA5Iwn9PHYsvCpKxqRX-qM,17717
+esgpull/exceptions.py,sha256=wgLyhyIITdusNucPjnnURJX1Jxv1VVIr9PzJV_77qhg,3275
+esgpull/fs.py,sha256=O52QD7DVJImYYf9wWECMNWYrGt8EcHQ3z9TzroK6VAY,7623
+esgpull/graph.py,sha256=CeaRcIAWMpVAJ-o6v6b3ffzy-ter-8HZ3tmxoN-Z-FM,15925
+esgpull/install_config.py,sha256=hzYpcHMtPMOK9fYcvVH-Hn_8zYsbs3yXlYgMumXo1zE,5598
+esgpull/processor.py,sha256=noenWExukON2P4klMN8Vt1ALzApmvc5gpsFqd7J5g78,5446
+esgpull/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+esgpull/result.py,sha256=f64l9gPFpFWgctmHVYrNWJvuXXB1sxpxXzJEIssLXxc,1020
+esgpull/tui.py,sha256=GTk86277Vv4msP2YJGpFWMQqxFhW_WSvxViU9nDFeAU,10407
+esgpull/utils.py,sha256=eKipKCqj15dzCAqs1o7x5O1XClWPmDEM-qSvNwGZmXY,1233
+esgpull/version.py,sha256=IHT4mKrIr8eV-C3HtmIVD85iGVH25n2ohoff31kaJ1A,93
+esgpull/cli/__init__.py,sha256=mvxiV7bRJlJ3uAfxr6hHDcuQDvy70TGkKyY5W4wE4SY,1686
+esgpull/cli/add.py,sha256=PhTe-jY7CNWYVtD1qYptGgIwYat2RYUfV-RHG_-SWbU,3270
 esgpull/cli/autoremove.py,sha256=g76_qnc3q84zSO7W0JsbWtGN4AfWBXTkQJO6gPCs2Pw,1336
 esgpull/cli/config.py,sha256=JbSa2NvXxccbOpEyvJd4vSlBnwb_NClx5sCJp_WY7-k,4048
 esgpull/cli/convert.py,sha256=Nonu49aijY3OFq2MNCqs7EQ08NXFiT0ehvNxoGp4NCE,9847
-esgpull/cli/decorators.py,sha256=a8lhbhe9ppaNj_kSwPfdeVkq9pEwchiGb52ZbG8EYWI,6475
+esgpull/cli/datasets.py,sha256=wO_gZUhvWy027q2jX2hAW25wJkIGrYHHCYuGAbcTmG8,2374
+esgpull/cli/decorators.py,sha256=X5Ja6HlB_AgpTohpbF2EjtT5sA0IdPxX20g-j1K7raM,6727
 esgpull/cli/download.py,sha256=3_Fm8JJYBWKs63oQ1OLaHJCv9ccbeY2gIW8SDasaYNE,2356
 esgpull/cli/facet.py,sha256=V1u-DxNkhswwSt0qpXvuHrCI_tE8jAJGEe6_fMhYbaM,584
 esgpull/cli/get.py,sha256=2WXL01Ri0P_2Rf1xrp9bnsrrxir6whxkAC0SnohjFpg,678
@@ -17,25 +30,15 @@ esgpull/cli/install.py,sha256=fd8nKwIFvOivgn_gOGn7XIk1BB9LXnhQB47KuIIy5AU,2880
 esgpull/cli/login.py,sha256=FZ63SsB4fCDixwf7gMUR697Dk89W1OvpgeadKE4IqEU,2153
 esgpull/cli/remove.py,sha256=p26hPhsgAgmAF4IsvjAI3jtzlIUq3k8Rxb0GTKYoEQM,2517
 esgpull/cli/retry.py,sha256=UVpAjW_N7l6RTJ-T5qXojwcXPzzjT7sDKb_wBdvavrg,1310
-esgpull/cli/search.py,sha256=6-c-W78b45-wo9GIVIzq8fYkqIY5NE7QvILsUb3M8Uk,6232
+esgpull/cli/search.py,sha256=c2OI0Xvw6h2zBnC8msjxidKJZ0KKUuWJK9FuAmQ15ZU,6369
 esgpull/cli/self.py,sha256=7nEEsK5W_Pth8IOSmvJHRlfwPPgXldhHAQK9yqf01S8,7932
 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=HvdVkF-ZmJLAL29D757oDAolwXvP_ehOtD0TnGkmZ24,6828
-esgpull/cli/utils.py,sha256=0SAJpeE13pHxt_5lfKn9tnjutUxeXqQ8xZWyJaeW-sU,7121
-esgpull/config.py,sha256=WelBOrkaTPldk4UasFJvku5DRh7062kO6CPHNWSV3Wc,11529
-esgpull/constants.py,sha256=3eq5Yow519p3YLAKjNdwOt1Ooei62FE9HykqCiyhZYE,1074
-esgpull/context.py,sha256=oSymljW0hZLGhCJxo7lh96Eq3SI_KOT_jFMPHckIrm0,23203
-esgpull/database.py,sha256=4JONNJpt7JzeohgBtRO2hpQUUFtV_wTncU20HjWPGVA,5431
-esgpull/download.py,sha256=3YcGLrffzAmuiV49tYsW-7PuVYcSFtbsZnH2Q26khm0,5491
-esgpull/esgpull.py,sha256=nmRZA72erSav2EfJJUNljkZzVKogKPRWuYHyNiCB7NI,16098
-esgpull/exceptions.py,sha256=uK5ApBZJPwLlR7hYpvwQdApVtugn7_-N-MMmR8HpEgE,3215
-esgpull/fs.py,sha256=O52QD7DVJImYYf9wWECMNWYrGt8EcHQ3z9TzroK6VAY,7623
-esgpull/graph.py,sha256=CeaRcIAWMpVAJ-o6v6b3ffzy-ter-8HZ3tmxoN-Z-FM,15925
-esgpull/install_config.py,sha256=mGZLaYEDaXlmX9obl_9d7jTyweT8UcP3XSo5RZRkkpk,5295
+esgpull/cli/update.py,sha256=x_R4x7hdUp5qowcFUibIMozwWTlJybuZMY_EXWhj_kI,7024
+esgpull/cli/utils.py,sha256=mMCVUuHEG1g3KPGq_Jx1p1AfJCVFwxR23GsQRtV88xA,7262
 esgpull/migrations/README,sha256=heMzebYwlGhnE8_4CWJ4LS74WoEZjBy-S-mIJRxAEKI,39
-esgpull/migrations/env.py,sha256=qv0RBnOOTx-f8rnemoTIm48JasLxNzbczq5wUBRQchg,2190
+esgpull/migrations/env.py,sha256=am2HhFrlIZNlXCaA5Ye7yKbIJ2MRSO5UFmUwB8l9fyE,2285
 esgpull/migrations/script.py.mako,sha256=HNlf26BI1xvQKjiUojnj15BPrVUfVVr81IOgliJf83c,510
 esgpull/migrations/versions/0.3.0_update_tables.py,sha256=r0rGX_cQSNX74JM5tZ8iqgstsAdfJH5rO3gGPkOxpok,5540
 esgpull/migrations/versions/0.3.1_update_tables.py,sha256=Fm7o-ZVvuyFcyReXXLhXQJQ-feCrbY2c0wnKwYnj_5k,493
@@ -58,22 +61,23 @@ esgpull/migrations/versions/0.6.1_update_tables.py,sha256=L4mkKlZUz4ftINwNeVNsPh
 esgpull/migrations/versions/0.6.2_update_tables.py,sha256=LFUVgDhxSll9FpvNFm-idD5t-SI3R30IO7cTzvShLVI,493
 esgpull/migrations/versions/0.6.3_update_tables.py,sha256=ut4M0b90OWVB9pKSGTJ4Bl5cucXFJzRD4-WA_ego0WY,493
 esgpull/migrations/versions/0.6.4_update_tables.py,sha256=PFALlSAjCFOqqoQgjq2TF0HjGc22fVdStMK2NNNa3Yk,493
+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/models/__init__.py,sha256=rfa1yGLVDahFrnhq_8TPGzr7_oeBOFKNVD9EF0slUtY,725
 esgpull/models/base.py,sha256=3nbR2lYMHWfovWz4EiAJ2bIvKpMadRvYZDdMRQDvN7M,1237
 esgpull/models/dataset.py,sha256=1fOIVYIWKK5BivqvBpjfxrNpy9VfUHZng9Yc6ipPK1Q,905
 esgpull/models/facet.py,sha256=COMgFjsxQcgb4uGMLy5JDRFWeMSHO-QDdG-cWpwvYqQ,459
 esgpull/models/file.py,sha256=-8PPYtq7BWp-O_QtCDbkLdhTGTPhI1F1nodQacMnYGA,1517
 esgpull/models/options.py,sha256=yzADDeDgtMymFdKG31JMl8sds-LnWDmjtaCpQ6EUKQ0,4745
-esgpull/models/query.py,sha256=D-D0q1oz1L6FoshXgJDflg6iyR9W85dxnP8vKTRvdww,16719
-esgpull/models/selection.py,sha256=5LlKhCM7FK3WieGuI2xLw5b_GvSlAGrmu67NtgIDd6c,5803
-esgpull/models/sql.py,sha256=T2whCvz_MFb0tY5Ij5xcFlZ4TxrS0JT1rRU_gd2qVsg,7041
+esgpull/models/query.py,sha256=sMtwdnTRcPzK_KCIXXN9YEQ8TdaGW2z3m6RDeyQJU94,16712
+esgpull/models/selection.py,sha256=QCX_2eoCJcYB1ULll-J7UV5lCpkweis92FANQY8pH0o,5895
+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/processor.py,sha256=noenWExukON2P4klMN8Vt1ALzApmvc5gpsFqd7J5g78,5446
-esgpull/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-esgpull/result.py,sha256=f64l9gPFpFWgctmHVYrNWJvuXXB1sxpxXzJEIssLXxc,1020
-esgpull/tui.py,sha256=MG3VULh8uTrRspw_kFuhunmHqscO9Xd7PS7MG9WyvMY,10395
-esgpull/utils.py,sha256=eKipKCqj15dzCAqs1o7x5O1XClWPmDEM-qSvNwGZmXY,1233
-esgpull/version.py,sha256=WMmvm2Keb76yMz8OL_h4fKT34Xpi-1BVfCiTn2QGzz4,22
-esgpull-0.6.4.dist-info/RECORD,,
+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.6.4.dist-info → esgpull-0.7.1.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: pdm-backend (2.3.2)
+Generator: hatchling 1.25.0
 Root-Is-Purelib: true
 Tag: py3-none-any

{esgpull-0.6.4.dist-info → esgpull-0.7.1.dist-info}/entry_points.txt

@@ -1,3 +1,2 @@
 [console_scripts]
 esgpull = esgpull.cli:main
-