nucliadb 6.6.1.post4596__py3-none-any.whl → 6.6.1.post4598__py3-none-any.whl

nucliadb/ingest/orm/processor/pgcatalog.py

@@ -65,12 +65,20 @@ async def pgcatalog_update(txn: Transaction, kbid: str, resource: Resource, inde
         modified_at = created_at
 
     async with _pg_transaction(txn).connection.cursor() as cur:
+        # Do not index canceled labels
+        cancelled_labels = {
+            f"/l/{clf.labelset}/{clf.label}"
+            for clf in resource.basic.usermetadata.classifications
+            if clf.cancelled_by_user
+        }
+
         # Labels from the resource and classification labels from each field
         labels = [label for label in index_message.labels]
-        for field in (await resource.get_fields()).values():
-            meta = await field.get_field_metadata()
-            if meta:
-                labels += [f"/l/{c.labelset}/{c.label}" for c in meta.metadata.classifications]
+        for classification in resource.basic.computedmetadata.field_classifications:
+            for clf in classification.classifications:
+                label = f"/l/{clf.labelset}/{clf.label}"
+                if label not in cancelled_labels:
+                    labels.append(label)
 
         await cur.execute(
             """

{nucliadb-6.6.1.post4596.dist-info → nucliadb-6.6.1.post4598.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nucliadb
-Version: 6.6.1.post4596
+Version: 6.6.1.post4598
 Summary: NucliaDB
 Author-email: Nuclia <nucliadb@nuclia.com>
 License-Expression: AGPL-3.0-or-later
@@ -19,11 +19,11 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3 :: Only
 Requires-Python: <4,>=3.9
 Description-Content-Type: text/markdown
-Requires-Dist: nucliadb-telemetry[all]>=6.6.1.post4596
-Requires-Dist: nucliadb-utils[cache,fastapi,storages]>=6.6.1.post4596
-Requires-Dist: nucliadb-protos>=6.6.1.post4596
-Requires-Dist: nucliadb-models>=6.6.1.post4596
-Requires-Dist: nidx-protos>=6.6.1.post4596
+Requires-Dist: nucliadb-telemetry[all]>=6.6.1.post4598
+Requires-Dist: nucliadb-utils[cache,fastapi,storages]>=6.6.1.post4598
+Requires-Dist: nucliadb-protos>=6.6.1.post4598
+Requires-Dist: nucliadb-models>=6.6.1.post4598
+Requires-Dist: nidx-protos>=6.6.1.post4598
 Requires-Dist: nucliadb-admin-assets>=1.0.0.post1224
 Requires-Dist: nuclia-models>=0.43.0
 Requires-Dist: uvicorn[standard]

{nucliadb-6.6.1.post4596.dist-info → nucliadb-6.6.1.post4598.dist-info}/RECORD

@@ -167,7 +167,7 @@ nucliadb/ingest/orm/utils.py,sha256=fCQRuyecgqhaY7mcBG93oaXMkzkKb9BFjOcy4-ZiSNw,
 nucliadb/ingest/orm/processor/__init__.py,sha256=Aqd9wCNTvggkMkCY3WvoI8spdr94Jnqk-0iq9XpLs18,922
 nucliadb/ingest/orm/processor/auditing.py,sha256=TeYhXGJRyQ7ROytbb2u8R0fIh_FYi3HgTu3S1ribY3U,4623
 nucliadb/ingest/orm/processor/data_augmentation.py,sha256=v-pj4GbBWSuO8dQyahs5UDr5ghsyfhCZDS0ftKd6ZYc,5179
-nucliadb/ingest/orm/processor/pgcatalog.py,sha256=f0_bV_5qMGXMG7iLK1DnVwi_pXwFvezfdt3aJ0fZfaQ,4347
+nucliadb/ingest/orm/processor/pgcatalog.py,sha256=VPQ_Evme7xmmGoQ45zt0Am0yPkaD4hxN1r5rEaVt6s8,4633
 nucliadb/ingest/orm/processor/processor.py,sha256=jaEBwbv--WyoC8zcdxWAyF0dAzVA5crVDJl56Bqv1eI,31444
 nucliadb/ingest/orm/processor/sequence_manager.py,sha256=uqEphtI1Ir_yk9jRl2gPf7BlzzXWovbARY5MNZSBI_8,1704
 nucliadb/ingest/service/__init__.py,sha256=LHQFUkdmNBOWqBG0Md9sMMI7g5TQZ-hLAnhw6ZblrJg,2002
@@ -375,8 +375,8 @@ nucliadb/writer/tus/local.py,sha256=7jYa_w9b-N90jWgN2sQKkNcomqn6JMVBOVeDOVYJHto,
 nucliadb/writer/tus/s3.py,sha256=vF0NkFTXiXhXq3bCVXXVV-ED38ECVoUeeYViP8uMqcU,8357
 nucliadb/writer/tus/storage.py,sha256=ToqwjoYnjI4oIcwzkhha_MPxi-k4Jk3Lt55zRwaC1SM,2903
 nucliadb/writer/tus/utils.py,sha256=MSdVbRsRSZVdkaum69_0wku7X3p5wlZf4nr6E0GMKbw,2556
-nucliadb-6.6.1.post4596.dist-info/METADATA,sha256=BGQonZKHKd6s_8MEWZ2NMWLh1cw9lLxHES6QWnoVQww,4158
-nucliadb-6.6.1.post4596.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nucliadb-6.6.1.post4596.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
-nucliadb-6.6.1.post4596.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
-nucliadb-6.6.1.post4596.dist-info/RECORD,,
+nucliadb-6.6.1.post4598.dist-info/METADATA,sha256=P8-9aKg935Lvk2oJsW7sWQaS3oiyEEh5TX0RuoRPqMo,4158
+nucliadb-6.6.1.post4598.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nucliadb-6.6.1.post4598.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
+nucliadb-6.6.1.post4598.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
+nucliadb-6.6.1.post4598.dist-info/RECORD,,