esgpull 0.9.2__py3-none-any.whl → 0.9.3__py3-none-any.whl

esgpull/context.py

@@ -22,7 +22,11 @@ from esgpull.tui import logger
 from esgpull.utils import format_date_iso, sync
 
 # workaround for notebooks with running event loop
-if asyncio.get_event_loop().is_running():
+try:
+    asyncio.get_running_loop()
+except RuntimeError:
+    pass
+else:
     import nest_asyncio
 
     nest_asyncio.apply()
@@ -63,6 +67,16 @@ class IndexNode:
         return result
 
 
+def quote_str(s: str) -> str:
+    if "*" in s:
+        # don't quote when `*` is present, quotes enforce exact match
+        return s
+    elif not s.startswith('"') and not s.endswith('"'):
+        return f'"{s}"'
+    else:
+        return s
+
+
 @dataclass
 class Result:
     query: Query
@@ -119,14 +133,17 @@ class Result:
         #     query["end"] = format_date_iso(str(facets.pop("end")))
         solr_terms: list[str] = []
         for name, values in self.query.selection.items():
-            value_term = " ".join(values)
+            if index.is_bridge():
+                value_term = " ".join(quote_str(v) for v in values)
+            else:
+                value_term = " ".join(values)
             if name == "query":  # freetext case
                 solr_terms.append(value_term)
             else:
                 if len(values) > 1:
                     value_term = f"({value_term})"
                 if name.startswith("!"):
-                    solr_terms.append(f"(NOT {name[1:]}:{value_term})")
+                    solr_terms.append(f"NOT ({name[1:]}:{value_term})")
                 else:
                     solr_terms.append(f"{name}:{value_term}")
         if solr_terms:
@@ -507,6 +524,8 @@ class Context:
             result.process()
             if result.processed:
                 hits.append(result.data)
+            else:
+                hits.append(0)
         return hits
 
     async def _hints(self, *results: ResultHints) -> list[HintsDict]:
@@ -756,3 +775,13 @@ class Context:
             date_to=date_to,
             keep_duplicates=keep_duplicates,
         )
+
+    def probe(self, index_node: str | None = None) -> None:
+        noraise = self.noraise
+        self.noraise = False
+        _ = self.hits(
+            Query(),
+            file=True,
+            index_node=index_node or self.config.api.index_node,
+        )
+        self.noraise = noraise

esgpull/esgpull.py

@@ -22,7 +22,6 @@ from rich.progress import (
     TransferSpeedColumn,
 )
 
-from esgpull.auth import Auth, Credentials
 from esgpull.config import Config
 from esgpull.context import Context
 from esgpull.database import Database
@@ -64,7 +63,6 @@ class Esgpull:
     path: Path
     config: Config
     ui: UI
-    auth: Auth
     db: Database
     context: Context
     fs: Filesystem
@@ -120,8 +118,6 @@ class Esgpull:
             verbosity=verbosity,
             record=record,
         )
-        credentials = Credentials.from_config(self.config)
-        self.auth = Auth.from_config(self.config, credentials)
         self.context = Context(self.config, noraise=True)
         if load_db:
             self.db = Database.from_config(self.config)
@@ -431,7 +427,6 @@ class Esgpull:
             start_callbacks[file.sha] = [callback]
         processor = Processor(
             config=self.config,
-            auth=self.auth,
             fs=self.fs,
             files=queue,
             start_callbacks=start_callbacks,

esgpull/migrations/versions/0.9.3_update_tables.py

@@ -0,0 +1,28 @@
+"""update tables
+
+Revision ID: 0.9.3
+Revises: 0.9.2
+Create Date: 2025-11-18 15:40:35.122823
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '0.9.3'
+down_revision = '0.9.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/plugin.py

@@ -12,9 +12,9 @@ from typing import Any, Callable, Literal
 
 import tomlkit
 from packaging import version
+from pydantic import TypeAdapter
 
 import esgpull.models
-from esgpull.config import cast_value
 from esgpull.tui import logger
 from esgpull.version import __version__
 
@@ -473,7 +473,8 @@ class PluginManager:
         # Update the value in both places
         if key in self.config.plugins[plugin_name]:
             old_value = self.config.plugins[plugin_name][key]
-            new_value = cast_value(old_value, value, key)
+            ta = TypeAdapter(type(old_value))
+            new_value = ta.validate_python(value)
             self.config.plugins[plugin_name][key] = new_value
             # Also update in _raw to keep in sync
             self.config._raw["plugins"][plugin_name][key] = new_value

esgpull/processor.py

@@ -7,7 +7,6 @@ from typing import TypeAlias
 from aiostream.stream import merge
 from httpx import AsyncClient, HTTPError
 
-from esgpull.auth import Auth
 from esgpull.config import Config
 from esgpull.download import DownloadCtx, Simple
 from esgpull.exceptions import DownloadSizeError
@@ -122,13 +121,11 @@ class Processor:
     def __init__(
         self,
         config: Config,
-        auth: Auth,
         fs: Filesystem,
         files: list[File],
         start_callbacks: dict[str, list[Callback]],
     ) -> None:
         self.config = config
-        self.auth = auth
         self.fs = fs
         self.files = list(filter(self.should_download, files))
         self.tasks: list[Task] = []
@@ -161,7 +158,6 @@ class Processor:
         semaphore = asyncio.Semaphore(self.config.download.max_concurrent)
         async with AsyncClient(
             follow_redirects=True,
-            cert=self.auth.cert,
             verify=self.ssl_context,
             timeout=self.config.download.http_timeout,
         ) as client:

esgpull/tui.py

@@ -28,7 +28,7 @@ from tomlkit import dumps as tomlkit_dumps
 from yaml import dump as yaml_dump
 
 from esgpull.config import Config
-from esgpull.constants import ESGPULL_DEBUG
+from esgpull.constants import ESGPULL_DEBUG, ESGPULL_DEBUG_LOCALS
 
 logger = logging.getLogger("esgpull")
 logging.root.setLevel(logging.DEBUG)
@@ -180,7 +180,7 @@ class UI:
             yield
         except (click.exceptions.Exit, click.exceptions.Abort):
             if temp_path is not None:
-                atexit.register(temp_path.unlink)
+                atexit.register(lambda: temp_path.unlink(missing_ok=True))
             raise
         except click.exceptions.ClickException:
             raise
@@ -205,10 +205,10 @@ class UI:
                     f"See [yellow]{temp_path}[/] for error log.",
                     err=True,
                 )
-            if ESGPULL_DEBUG:
+            if ESGPULL_DEBUG or ESGPULL_DEBUG_LOCALS:
                 from rich.traceback import install
 
-                install()
+                install(show_locals=ESGPULL_DEBUG_LOCALS)
                 raise
             elif onraise is not None:
                 raise onraise
@@ -218,7 +218,7 @@ class UI:
                 raise
         else:
             if temp_path is not None:
-                atexit.register(temp_path.unlink)
+                atexit.register(lambda: temp_path.unlink(missing_ok=True))
         finally:
             logging.root.removeHandler(handler)
 

{esgpull-0.9.2.dist-info → esgpull-0.9.3.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: esgpull
-Version: 0.9.2
+Version: 0.9.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/
@@ -21,10 +21,11 @@ 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: packaging>=25.0
 Requires-Dist: platformdirs>=2.6.2
+Requires-Dist: pydantic-settings>=2.10.1
+Requires-Dist: pydantic>=2.11.7
 Requires-Dist: pyopenssl>=22.1.0
 Requires-Dist: pyparsing>=3.0.9
 Requires-Dist: pyyaml>=6.0

{esgpull-0.9.2.dist-info → esgpull-0.9.3.dist-info}/RECORD

@@ -1,23 +1,22 @@
 esgpull/__init__.py,sha256=XItFDIMNmFUNNcKtUgXdfmGwUIWt4AAv0a4mZkfj5P8,240
-esgpull/auth.py,sha256=QZ-l1ySLMP0fvuwYHRLv9FZYp1gqfju_eGaTMDByUxw,5205
-esgpull/config.py,sha256=9atYqxc3PiJKY1hfoEWZxf5Ba6U9SzMUs4QvcWWGFy0,13423
-esgpull/constants.py,sha256=WjG7xzMZNckOv5GhRehBtI7hoSwwLZvwkvEq5RG-dv4,1189
-esgpull/context.py,sha256=iyHAJ9OXU5_0SYcXNlmJI_M6x3vphJjnnAcsfB4MxQ8,24383
+esgpull/config.py,sha256=APA3IqYyz_TY2FAm_TNSLsFIkOxmdGnbFLnd2H2YXIs,12042
+esgpull/constants.py,sha256=VlgRJDth5aDjyTopJ2W2JU83353XcRf18RIFAZt7yck,1263
+esgpull/context.py,sha256=JEnIQGF1owl56n0azF8K3GNIU8TgeMu31NSfTqVAGQg,25123
 esgpull/database.py,sha256=1wGeNbJp0gOLo5Q1N53JfiwVbZ8nfvZVkKlvEaJwOpU,6716
 esgpull/download.py,sha256=aR2c_SOuZtgX7tI2a9_N4Mn86ABq1k7Mxq_BdojFrP4,5600
-esgpull/esgpull.py,sha256=-OwaWvwmkur_mdVNKKxdxlASeK93tmOceV__jGRMwqo,19666
+esgpull/esgpull.py,sha256=mqvrXnyCzTSU3j_u5pYidpLs2j86TEFDPX6MhCnNfMs,19458
 esgpull/exceptions.py,sha256=wgLyhyIITdusNucPjnnURJX1Jxv1VVIr9PzJV_77qhg,3275
 esgpull/fs.py,sha256=sc7Af2E3yh3V9KVuSPSXFBuFtlQ3L99UZmS1ZJuiBeM,7280
 esgpull/graph.py,sha256=Yl2VuF8PNn0R5xRyEK58Q1Xlx8B1PfhbTwt1JftFDro,15929
 esgpull/install_config.py,sha256=hzYpcHMtPMOK9fYcvVH-Hn_8zYsbs3yXlYgMumXo1zE,5598
-esgpull/plugin.py,sha256=do6b4duPyAhNnYXWmFiVAlgNKj2FJcEjAMPqT8JqxtA,18871
-esgpull/processor.py,sha256=WLf4NFO_dp27E0GhZAiekiRD-gT6uyFJJnFZKbFV5vU,5484
+esgpull/plugin.py,sha256=t6iejis65UREQ71gnj1-gVFhlrGt1z1n3SpJ6KiP57E,18904
+esgpull/processor.py,sha256=ubhlKMMOY_ieZEcN9zcDPlmZxQDXqb2QVmeCwWo7zOE,5376
 esgpull/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 esgpull/result.py,sha256=f64l9gPFpFWgctmHVYrNWJvuXXB1sxpxXzJEIssLXxc,1020
-esgpull/tui.py,sha256=jpfDK_g_taNPEu0FeJ4MM1vtNJfOJY5x3dkUxRkoPEA,11210
+esgpull/tui.py,sha256=XJs8AUm28YLWl3ephpxY8jHFvG7HrIr08u3RdYvABdE,11338
 esgpull/utils.py,sha256=pLMQfY0p2oNIFyCZhHBD74BOAJtmt9QV6dTJ79VsfF8,1213
 esgpull/version.py,sha256=IHT4mKrIr8eV-C3HtmIVD85iGVH25n2ohoff31kaJ1A,93
-esgpull/cli/__init__.py,sha256=Q-U7opBTHxF5yUyyv15Cj-4Y9MaDMJ4i5FxNL-EmHfs,1683
+esgpull/cli/__init__.py,sha256=W0q_eyhvtPgyX5cXKSDDLUUrskGLzgNoJ9VCY9fJ6pY,1701
 esgpull/cli/add.py,sha256=h8xFy5ORzY9O4SPPo4VCtTybeJJ5GcA18w4TZeL0DqU,3507
 esgpull/cli/autoremove.py,sha256=g76_qnc3q84zSO7W0JsbWtGN4AfWBXTkQJO6gPCs2Pw,1336
 esgpull/cli/config.py,sha256=g7Me173B_SWtdnQcitcTDnj-06-1SW0f8Z8SOcjMAcQ,3683
@@ -26,17 +25,17 @@ esgpull/cli/decorators.py,sha256=X5Ja6HlB_AgpTohpbF2EjtT5sA0IdPxX20g-j1K7raM,672
 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
+esgpull/cli/index_nodes.py,sha256=v6DySuWsxtBkWIaKnUVUqJdjAb7J5OIpfgP3B0Ut-ls,2627
 esgpull/cli/install.py,sha256=fd8nKwIFvOivgn_gOGn7XIk1BB9LXnhQB47KuIIy5AU,2880
-esgpull/cli/login.py,sha256=FZ63SsB4fCDixwf7gMUR697Dk89W1OvpgeadKE4IqEU,2153
 esgpull/cli/plugins.py,sha256=lM8eQIH4H_bIy49rC2flmTstpr9ILDBYXp1YYYMv7qw,13366
 esgpull/cli/remove.py,sha256=9fqE8NJdr1mHypu_N-TBJy_yl3elUBSfzEARxxTkqKg,2662
 esgpull/cli/retry.py,sha256=UVpAjW_N7l6RTJ-T5qXojwcXPzzjT7sDKb_wBdvavrg,1310
-esgpull/cli/search.py,sha256=J41dRi0mS-XsJyWsDzXsv04yWHPwhVG2VOEcdPnaak8,6940
+esgpull/cli/search.py,sha256=E64uvlmgFGyNAvtBk9dlFbNeulNfAHUCQta8PHBxSPo,6968
 esgpull/cli/self.py,sha256=psgFcgkDyemquZEpoWp2cyjgampCgDzRc1QBvzqGs24,7941
 esgpull/cli/show.py,sha256=B-h7bKMrwgjnTHio2du8IPOLlKCaan56RQKAtzlQzcw,2822
 esgpull/cli/status.py,sha256=HEyj6QFABblADtYf1PWmSzghKX3fs33x9p5vpSqA514,2521
 esgpull/cli/track.py,sha256=Q9ZvvV5FFGzp6wQZflAd_OFmqhAWgl1JFBad2dCbEF0,3089
-esgpull/cli/update.py,sha256=3JBf1HqglazUYZ63uHtm5y3ZAuS2XLGcwrsVYBkrmb0,9432
+esgpull/cli/update.py,sha256=TiVKXBxye2ZW627zoNyMQtCPhkdiLiTDngRjaVUqGO4,9460
 esgpull/cli/utils.py,sha256=dE5dIH6tWmhItarLDrNldiUuuX5qUjnVpnu4KkE6V1g,7199
 esgpull/migrations/README,sha256=heMzebYwlGhnE8_4CWJ4LS74WoEZjBy-S-mIJRxAEKI,39
 esgpull/migrations/env.py,sha256=am2HhFrlIZNlXCaA5Ye7yKbIJ2MRSO5UFmUwB8l9fyE,2285
@@ -71,6 +70,7 @@ esgpull/migrations/versions/0.8.0_update_tables.py,sha256=5rr3guWipnnuciFuviUxZU
 esgpull/migrations/versions/0.9.0_update_tables.py,sha256=nXfPiyuseD5BXvu59zkeSTzb6EA7txpBudclU-MIyU0,555
 esgpull/migrations/versions/0.9.1_update_tables.py,sha256=ITewU2qgdCwhorsl2d_t7ENt_6KecG3z5xfRr_LwrtY,541
 esgpull/migrations/versions/0.9.2_update_tables.py,sha256=aux--HPA_jUtvk7Zb2ZRXRhnRLT-whqZ0lLWt8Apyac,541
+esgpull/migrations/versions/0.9.3_update_tables.py,sha256=-k1CneOa7OTO6xPZ8uR0ccy-4B8TU3kM12-oYKFEOlA,541
 esgpull/migrations/versions/14c72daea083_query_add_column_updated_at.py,sha256=MKqz0tfwGwRkgP4QDd-cpUmXCVr4tM_wlC2BfxqJ1_w,1031
 esgpull/migrations/versions/c7c8541fa741_query_add_column_added_at.py,sha256=Al_o7fDmoRqc9vBCQgtgrNbSPIOBxdMZ5T-ztakqVeY,1033
 esgpull/migrations/versions/d14f179e553c_file_add_composite_index_dataset_id_.py,sha256=0vJvttugWmgKns4g-K4i3EU6eid2Z_K2e3H6Ktevf7c,860
@@ -87,8 +87,8 @@ esgpull/models/sql.py,sha256=K8Nre5HKFPjkRzUUW6p6Qk7aG8upbw8C3pnmCFlg7d8,8942
 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.9.2.dist-info/METADATA,sha256=58JNkrLxhc7gH87SOzgLz6VTIZX5ylTAGfbYFMcv0Jg,3781
-esgpull-0.9.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-esgpull-0.9.2.dist-info/entry_points.txt,sha256=vyh7HvFrCp4iyMrTkDoSF3weaYrlNj2OJe0Fq5q4QB4,45
-esgpull-0.9.2.dist-info/licenses/LICENSE,sha256=lUqGPGWDHHxjkUDuYgjLLY2XQXXn_EHU7fnrQWHGugc,1540
-esgpull-0.9.2.dist-info/RECORD,,
+esgpull-0.9.3.dist-info/METADATA,sha256=0wlDuo4TCJskBSO9v4FRuoLTAm7531jOPJDQAQJWBP4,3818
+esgpull-0.9.3.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+esgpull-0.9.3.dist-info/entry_points.txt,sha256=vyh7HvFrCp4iyMrTkDoSF3weaYrlNj2OJe0Fq5q4QB4,45
+esgpull-0.9.3.dist-info/licenses/LICENSE,sha256=lUqGPGWDHHxjkUDuYgjLLY2XQXXn_EHU7fnrQWHGugc,1540
+esgpull-0.9.3.dist-info/RECORD,,

esgpull/auth.py

@@ -1,181 +0,0 @@
-from __future__ import annotations
-
-from enum import Enum, unique
-from pathlib import Path
-from shutil import rmtree
-from typing import Any
-from urllib.parse import (
-    ParseResult,
-    ParseResultBytes,
-    urljoin,
-    urlparse,
-    urlunparse,
-)
-from xml.etree import ElementTree
-
-import httpx
-import tomlkit
-from attrs import Factory, define, field
-from myproxy.client import MyProxyClient
-from OpenSSL import crypto
-
-from esgpull.config import Config
-from esgpull.constants import PROVIDERS
-
-
-class Secret:
-    def __init__(self, value: str | None = None) -> None:
-        self._value = value
-
-    def get_value(self) -> str | None:
-        return self._value
-
-    def __str__(self) -> str:
-        if self.get_value() is None:
-            return str(None)
-        else:
-            return "*" * 10
-
-    def __repr__(self) -> str:
-        return str(self)
-
-
-@define
-class Credentials:
-    provider: str | None = None
-    user: str | None = None
-    password: Secret = field(default=None, converter=Secret)
-
-    @staticmethod
-    def from_config(config: Config) -> Credentials:
-        path = config.paths.auth / config.credentials.filename
-        return Credentials.from_path(path)
-
-    @staticmethod
-    def from_path(path: Path) -> Credentials:
-        if path.is_file():
-            with path.open() as fh:
-                doc = tomlkit.load(fh)
-            return Credentials(**doc)
-        else:
-            return Credentials()
-
-    def write(self, path: Path) -> None:
-        if path.is_file():
-            raise FileExistsError(path)
-        with path.open("w") as f:
-            cred_dict = dict(
-                provider=self.provider,
-                user=self.user,
-                password=self.password.get_value(),
-            )
-            tomlkit.dump(cred_dict, f)
-
-    def parse_openid(self) -> ParseResult | ParseResultBytes | Any:
-        if self.provider not in PROVIDERS:
-            raise ValueError(f"unknown provider: {self.provider}")
-        ns = {"x": "xri://$xrd*($v*2.0)"}
-        provider = urlunparse(
-            [
-                "https",
-                self.provider,
-                urljoin(PROVIDERS[self.provider], self.user),
-                "",
-                "",
-                "",
-            ]
-        )
-        resp = httpx.get(str(provider))
-        resp.raise_for_status()
-        root = ElementTree.fromstring(resp.text)
-        services = root.findall(".//x:Service", namespaces=ns)
-        for service in services:
-            t = service.find("x:Type", namespaces=ns)
-            if t is None:
-                continue
-            elif t.text == "urn:esg:security:myproxy-service":
-                url = service.find("x:URI", namespaces=ns)
-                if url is not None:
-                    return urlparse(url.text)
-        raise ValueError("did not found host/port")
-
-
-@unique
-class AuthStatus(Enum):
-    Valid = ("valid", "green")
-    Expired = ("expired", "orange")
-    Missing = ("missing", "red")
-
-
-@define
-class Auth:
-    cert_dir: Path
-    cert_file: Path
-    credentials: Credentials = Factory(Credentials)
-    __status: AuthStatus | None = field(init=False, default=None, repr=False)
-
-    Valid = AuthStatus.Valid
-    Expired = AuthStatus.Expired
-    Missing = AuthStatus.Missing
-
-    @staticmethod
-    def from_config(
-        config: Config, credentials: Credentials = Credentials()
-    ) -> Auth:
-        return Auth.from_path(config.paths.auth, credentials)
-
-    @staticmethod
-    def from_path(
-        path: Path, credentials: Credentials = Credentials()
-    ) -> Auth:
-        cert_dir = path / "certificates"
-        cert_file = path / "credentials.pem"
-        return Auth(cert_dir, cert_file, credentials)
-
-    @property
-    def cert(self) -> str | None:
-        if self.status == AuthStatus.Valid:
-            return str(self.cert_file)
-        else:
-            return None
-
-    @property
-    def status(self) -> AuthStatus:
-        if self.__status is None:
-            self.__status = self._get_status()
-        return self.__status
-
-    def _get_status(self) -> AuthStatus:
-        if not self.cert_file.exists():
-            return AuthStatus.Missing
-        with self.cert_file.open("rb") as f:
-            content = f.read()
-        filetype = crypto.FILETYPE_PEM
-        pem = crypto.load_certificate(filetype, content)
-        if pem.has_expired():
-            return AuthStatus.Expired
-        return AuthStatus.Valid
-
-    # TODO: review this
-    def renew(self) -> None:
-        if self.cert_dir.is_dir():
-            rmtree(self.cert_dir)
-        self.cert_file.unlink(missing_ok=True)
-        openid = self.credentials.parse_openid()
-        client = MyProxyClient(
-            hostname=openid.hostname,
-            port=openid.port,
-            caCertDir=str(self.cert_dir),
-            proxyCertLifetime=12 * 60 * 60,
-        )
-        creds = client.logon(
-            self.credentials.user,
-            self.credentials.password.get_value(),
-            bootstrap=True,
-            updateTrustRoots=True,
-            authnGetTrustRootsCall=False,
-        )
-        with self.cert_file.open("wb") as file:
-            for cred in creds:
-                file.write(cred)
-        self.__status = None

esgpull/cli/login.py

@@ -1,56 +0,0 @@
-import click
-from click.exceptions import Abort
-
-from esgpull.auth import Auth, AuthStatus, Credentials
-from esgpull.cli.decorators import opts
-from esgpull.cli.utils import init_esgpull
-from esgpull.constants import PROVIDERS
-from esgpull.tui import Verbosity
-
-
-@click.command()
-@opts.verbosity
-@opts.force
-def login(verbosity: Verbosity, force: bool):
-    """
-    OpenID authentication and certificates renewal
-
-    The first call to `login` is a prompt asking for provider/username/password.
-
-    Subsequent calls check whether the login certificates are valid, renewing them if needed.
-    Renewal can be forced using the `--force` flag.
-    """
-    esg = init_esgpull(verbosity)
-    with esg.ui.logging("login", onraise=Abort):
-        cred_file = esg.config.paths.auth / esg.config.credentials.filename
-        if not cred_file.is_file():
-            esg.ui.print("No credentials found.")
-            choices = []
-            providers = list(PROVIDERS)
-            for i, provider in enumerate(providers):
-                choices.append(str(i))
-                esg.ui.print(f"  [{i}] [i green]{provider}[/]")
-            provider_idx = esg.ui.choice(
-                "Select a provider",
-                choices=choices,
-                show_choices=False,
-            )
-            provider = providers[int(provider_idx)]
-            user = esg.ui.prompt("User")
-            password = esg.ui.prompt("Password", password=True)
-            credentials = Credentials(provider, user, password)
-            credentials.write(cred_file)
-            esg.auth = Auth.from_config(esg.config, credentials)
-        renew = force
-        status = esg.auth.status
-        status_name = status.value[0]
-        status_color = status.value[1]
-        esg.ui.print(f"Certificates are [{status_color}]{status_name}[/].")
-        if esg.auth.status == AuthStatus.Expired:
-            renew = renew or esg.ui.ask("Renew?")
-        elif esg.auth.status == AuthStatus.Missing:
-            renew = True
-        if renew:
-            with esg.ui.spinner("Renewing certificates"):
-                esg.auth.renew()
-            esg.ui.print(":+1: Renewed successfully")