nucliadb 6.3.4.post3663__py3-none-any.whl → 6.3.4.post3680__py3-none-any.whl

nucliadb/ingest/fields/conversation.py

@@ -56,6 +56,7 @@ class Conversation(Field[PBConversation]):
     async def set_value(self, payload: PBConversation):
         last_page: Optional[PBConversation] = None
         metadata = await self.get_metadata()
+        metadata.extract_strategy = payload.extract_strategy
         if self._created is False and metadata.pages > 0:
             try:
                 last_page = await self.db_get_value(page=metadata.pages)

nucliadb/writer/api/v1/upload.py

@@ -45,7 +45,7 @@ from nucliadb.writer.api.v1.resource import (
 from nucliadb.writer.api.v1.slug import ensure_slug_uniqueness, noop_context_manager
 from nucliadb.writer.back_pressure import maybe_back_pressure
 from nucliadb.writer.resource.audit import parse_audit
-from nucliadb.writer.resource.basic import parse_basic_creation
+from nucliadb.writer.resource.basic import parse_basic_creation, parse_user_classifications
 from nucliadb.writer.resource.field import (
     atomic_get_stored_resource_classifications,
     parse_fields,
@@ -887,6 +887,9 @@ async def store_file_on_nuclia_db(
     parse_audit(writer.audit, request)
 
     unique_slug_context_manager = noop_context_manager()
+
+    resource_classifications = await atomic_get_stored_resource_classifications(kbid, rid)
+
     if item is not None:
         if item.slug:
             unique_slug_context_manager = ensure_slug_uniqueness(kbid, item.slug)
@@ -903,8 +906,9 @@ async def store_file_on_nuclia_db(
             parse_extra(writer.extra, item.extra)
 
         toprocess.title = writer.basic.title
-
-        resource_classifications = await atomic_get_stored_resource_classifications(kbid, rid)
+        if item.usermetadata:
+            # Any resource level classification that comes on the request payload overrides the stored ones
+            resource_classifications.resource_level = set(parse_user_classifications(item))
         await parse_fields(
             writer=writer,
             item=item,
@@ -958,8 +962,7 @@ async def store_file_on_nuclia_db(
             )
         )
 
-        rclassif = await atomic_get_stored_resource_classifications(kbid, rid)
-        classif_labels = rclassif.for_field(field, resources_pb2.FieldType.FILE)
+        classif_labels = resource_classifications.for_field(field, resources_pb2.FieldType.FILE)
         toprocess.filefield[field] = await processing.convert_internal_filefield_to_str(
             file_field, storage=storage, classif_labels=classif_labels
         )

nucliadb/writer/resource/field.py

@@ -484,6 +484,9 @@ async def parse_conversation_field(
         convs.messages.append(processing_message)
         field_value.messages.append(cm)
     convs.classification_labels = classif_labels
+    if conversation_field.extract_strategy:
+        field_value.extract_strategy = conversation_field.extract_strategy
+        convs.extract_strategy = conversation_field.extract_strategy
     toprocess.conversationfield[key] = convs
     writer.conversations[key].CopyFrom(field_value)
     writer.field_statuses.append(

{nucliadb-6.3.4.post3663.dist-info → nucliadb-6.3.4.post3680.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.2
 Name: nucliadb
-Version: 6.3.4.post3663
+Version: 6.3.4.post3680
 Summary: NucliaDB
 Author-email: Nuclia <nucliadb@nuclia.com>
 License: AGPL
@@ -20,11 +20,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.3.4.post3663
-Requires-Dist: nucliadb-utils[cache,fastapi,storages]>=6.3.4.post3663
-Requires-Dist: nucliadb-protos>=6.3.4.post3663
-Requires-Dist: nucliadb-models>=6.3.4.post3663
-Requires-Dist: nidx-protos>=6.3.4.post3663
+Requires-Dist: nucliadb-telemetry[all]>=6.3.4.post3680
+Requires-Dist: nucliadb-utils[cache,fastapi,storages]>=6.3.4.post3680
+Requires-Dist: nucliadb-protos>=6.3.4.post3680
+Requires-Dist: nucliadb-models>=6.3.4.post3680
+Requires-Dist: nidx-protos>=6.3.4.post3680
 Requires-Dist: nucliadb-admin-assets>=1.0.0.post1224
 Requires-Dist: nuclia-models>=0.24.2
 Requires-Dist: uvicorn

{nucliadb-6.3.4.post3663.dist-info → nucliadb-6.3.4.post3680.dist-info}/RECORD

@@ -130,7 +130,7 @@ nucliadb/ingest/consumer/shard_creator.py,sha256=8SotMc-o_G8XZU52gR4Aay7tcigTdIX
 nucliadb/ingest/consumer/utils.py,sha256=jpX8D4lKzuPCpArQLZeX_Zczq3pfen_zAf8sPJfOEZU,2642
 nucliadb/ingest/fields/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
 nucliadb/ingest/fields/base.py,sha256=DTXFu_g9vSU2h7S4PlYxd-hp4SDuM_EPf8y51ALgD8w,21654
-nucliadb/ingest/fields/conversation.py,sha256=OcQOHvi72Pm0OyNGwxLo9gONo8f1NhwASq0_gS-E64A,7021
+nucliadb/ingest/fields/conversation.py,sha256=0tVpHLvi3UmuO98puimBJUpPXv3qEOpqlWVXVYvz9Vw,7082
 nucliadb/ingest/fields/exceptions.py,sha256=2Cpntta3gNOnmGUdOe5ZMzP7k_308do14kaHVBPVCXs,1168
 nucliadb/ingest/fields/file.py,sha256=1v4jLg3balUua2VmSV8hHkAwPFShTUCOzufZvIUQcQw,4740
 nucliadb/ingest/fields/generic.py,sha256=elgtqv15aJUq3zY7X_g0bli_2BpcwPArVvzhe54Y4Ig,1547
@@ -336,12 +336,12 @@ nucliadb/writer/api/v1/router.py,sha256=RjuoWLpZer6Kl2BW_wznpNo6XL3BOpdTGqXZCn3Q
 nucliadb/writer/api/v1/services.py,sha256=HLQW18AEC5zQp5azpeAtRi7ZTzQSwG6SbmkHlmjTIFA,13165
 nucliadb/writer/api/v1/slug.py,sha256=xlVBDBpRi9bNulpBHZwhyftVvulfE0zFm1XZIWl-AKY,2389
 nucliadb/writer/api/v1/transaction.py,sha256=d2Vbgnkk_-FLGSTt3vfldwiJIUf0XoyD0wP1jQNz_DY,2430
-nucliadb/writer/api/v1/upload.py,sha256=iFHD3nB1ZXiSNyoOzIdzJ0PNLBnnlfOWPba1qWieT4o,33608
+nucliadb/writer/api/v1/upload.py,sha256=hLMHXSaqEOE-vjKjhIupgdx8klJc3mVQp_oMwx5N-7o,33800
 nucliadb/writer/api/v1/vectorsets.py,sha256=mESaXkkI9f-jWWMW61ZZgv7E5YWXKemyc6vwT0lFXns,6747
 nucliadb/writer/resource/__init__.py,sha256=cp15ZcFnHvpcu_5-aK2A4uUyvuZVV_MJn4bIXMa20ks,835
 nucliadb/writer/resource/audit.py,sha256=FvxMZPzrNHtd31HgpZEvxzwAkbxJTZRhPLqRYYJi3tA,1426
 nucliadb/writer/resource/basic.py,sha256=_zdAr110C7rtEzOKoBRMzPjAnQ0pAtRfGjB8qCzodvI,11767
-nucliadb/writer/resource/field.py,sha256=qnj31lM9F0AFlj3QhPcPj90vHg7SMbbYW098fMtYt9o,20053
+nucliadb/writer/resource/field.py,sha256=e5QGkR5ZDT1VUQgMXK7v6GGXJ2eek6jxGA0nPqjq_g4,20241
 nucliadb/writer/resource/origin.py,sha256=pvhUDdU0mlWPUcpoQi4LDUJaRtfjzVVrA8XcGVI_N8k,2021
 nucliadb/writer/tus/__init__.py,sha256=huWpKnDnjsrKlBBJk30ta5vamlA-4x0TbPs_2Up8hyM,5443
 nucliadb/writer/tus/azure.py,sha256=XhWAlWTM0vmXcXtuEPYjjeEhuZjiZXZu8q9WsJ7omFE,4107
@@ -352,8 +352,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.3.4.post3663.dist-info/METADATA,sha256=Olqrr9vrS1hKJrDcrbrYwfm62xUA3i4aj8WVRLxeePc,4291
-nucliadb-6.3.4.post3663.dist-info/WHEEL,sha256=52BFRY2Up02UkjOa29eZOS2VxUrpPORXg1pkohGGUS8,91
-nucliadb-6.3.4.post3663.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
-nucliadb-6.3.4.post3663.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
-nucliadb-6.3.4.post3663.dist-info/RECORD,,
+nucliadb-6.3.4.post3680.dist-info/METADATA,sha256=HBMmYu3BKtwkq1mebFgewWhQz19SH__337Y-7PeA2_U,4291
+nucliadb-6.3.4.post3680.dist-info/WHEEL,sha256=beeZ86-EfXScwlR_HKu4SllMC9wUEj_8Z_4FJ3egI2w,91
+nucliadb-6.3.4.post3680.dist-info/entry_points.txt,sha256=XqGfgFDuY3zXQc8ewXM2TRVjTModIq851zOsgrmaXx4,1268
+nucliadb-6.3.4.post3680.dist-info/top_level.txt,sha256=hwYhTVnX7jkQ9gJCkVrbqEG1M4lT2F_iPQND1fCzF80,20
+nucliadb-6.3.4.post3680.dist-info/RECORD,,

{nucliadb-6.3.4.post3663.dist-info → nucliadb-6.3.4.post3680.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (76.0.0)
+Generator: setuptools (76.1.0)
 Root-Is-Purelib: true
 Tag: py3-none-any