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

esgpull/context.py

@@ -134,18 +134,46 @@ class Result:
         solr_terms: list[str] = []
         for name, values in self.query.selection.items():
             if index.is_bridge():
-                value_term = " ".join(quote_str(v) for v in values)
+                if name == "query":
+                    solr_terms.append(" ".join(values))
+                elif name.startswith("!"):
+                    value_term = " ".join(quote_str(v) for v in values)
+                    if len(values) > 1:
+                        value_term = f"({value_term})"
+                    solr_terms.append(f"NOT ({name[1:]}:{value_term})")
+                else:
+                    has_wildcard = any("*" in v for v in values)
+                    no_wildcard = any("*" not in v for v in values)
+
+                    if has_wildcard and no_wildcard:
+                        logger.warning(
+                            (
+                                f"Facet {name} has mixed wildcard/non-wildcard values. "
+                                "Non-wildcard values may match partially."
+                            )
+                        )
+                        value_term = " ".join(quote_str(v) for v in values)
+                        if len(values) > 1:
+                            value_term = f"({value_term})"
+                        solr_terms.append(f"{name}:{value_term}")
+                    elif has_wildcard:
+                        value_term = " ".join(quote_str(v) for v in values)
+                        if len(values) > 1:
+                            value_term = f"({value_term})"
+                        solr_terms.append(f"{name}:{value_term}")
+                    else:
+                        params[name] = ",".join(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})")
+                if name == "query":
+                    solr_terms.append(value_term)
                 else:
-                    solr_terms.append(f"{name}:{value_term}")
+                    if len(values) > 1:
+                        value_term = f"({value_term})"
+                    if name.startswith("!"):
+                        solr_terms.append(f"NOT ({name[1:]}:{value_term})")
+                    else:
+                        solr_terms.append(f"{name}:{value_term}")
         if solr_terms:
             params["query"] = " AND ".join(solr_terms)
         for name, option in self.query.options.items(use_default=True):

esgpull/migrations/versions/0.9.4_update_tables.py

@@ -0,0 +1,28 @@
+"""update tables
+
+Revision ID: 0.9.4
+Revises: 0.9.3
+Create Date: 2026-01-14 10:49:04.536961
+
+"""
+from alembic import op
+import sqlalchemy as sa
+
+
+# revision identifiers, used by Alembic.
+revision = '0.9.4'
+down_revision = '0.9.3'
+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.9.3.dist-info → esgpull-0.9.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: esgpull
-Version: 0.9.3
+Version: 0.9.4
 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/

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

@@ -1,7 +1,7 @@
 esgpull/__init__.py,sha256=XItFDIMNmFUNNcKtUgXdfmGwUIWt4AAv0a4mZkfj5P8,240
 esgpull/config.py,sha256=APA3IqYyz_TY2FAm_TNSLsFIkOxmdGnbFLnd2H2YXIs,12042
 esgpull/constants.py,sha256=VlgRJDth5aDjyTopJ2W2JU83353XcRf18RIFAZt7yck,1263
-esgpull/context.py,sha256=JEnIQGF1owl56n0azF8K3GNIU8TgeMu31NSfTqVAGQg,25123
+esgpull/context.py,sha256=LGGnWnKuk9xkUvf5EX3NLbKKRlGvtRe9blps7C-dkTo,26558
 esgpull/database.py,sha256=1wGeNbJp0gOLo5Q1N53JfiwVbZ8nfvZVkKlvEaJwOpU,6716
 esgpull/download.py,sha256=aR2c_SOuZtgX7tI2a9_N4Mn86ABq1k7Mxq_BdojFrP4,5600
 esgpull/esgpull.py,sha256=mqvrXnyCzTSU3j_u5pYidpLs2j86TEFDPX6MhCnNfMs,19458
@@ -71,6 +71,7 @@ esgpull/migrations/versions/0.9.0_update_tables.py,sha256=nXfPiyuseD5BXvu59zkeST
 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/0.9.4_update_tables.py,sha256=tvvXvov7ggXO9A8B5399bixCuM9fSni1SHkJXa5f5II,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 +88,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.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-0.9.4.dist-info/METADATA,sha256=MKviUWHQuaz6SVYBYuWPky-4BZ3LBRyWaET0A3i4JaA,3818
+esgpull-0.9.4.dist-info/WHEEL,sha256=WLgqFyCfm_KASv4WHyYy0P3pM_m7J5L9k2skdKLirC8,87
+esgpull-0.9.4.dist-info/entry_points.txt,sha256=vyh7HvFrCp4iyMrTkDoSF3weaYrlNj2OJe0Fq5q4QB4,45
+esgpull-0.9.4.dist-info/licenses/LICENSE,sha256=lUqGPGWDHHxjkUDuYgjLLY2XQXXn_EHU7fnrQWHGugc,1540
+esgpull-0.9.4.dist-info/RECORD,,

{esgpull-0.9.3.dist-info → esgpull-0.9.4.dist-info}/WHEEL

@@ -1,4 +1,4 @@
 Wheel-Version: 1.0
-Generator: hatchling 1.27.0
+Generator: hatchling 1.28.0
 Root-Is-Purelib: true
 Tag: py3-none-any