nuclia 4.9.2__py3-none-any.whl → 4.9.4__py3-none-any.whl

nuclia/tests/test_nua/test_predict.py

@@ -1,6 +1,9 @@
-from nuclia_models.predict.generative_responses import TextGenerativeResponse
+from nuclia_models.predict.generative_responses import (
+    TextGenerativeResponse,
+    ConsumptionGenerative,
+)
 
-from nuclia.lib.nua_responses import ChatModel, UserPrompt
+from nuclia.lib.nua_responses import ChatModel, RerankModel, UserPrompt
 from nuclia.sdk.predict import AsyncNucliaPredict, NucliaPredict
 import pytest
 from nuclia_models.predict.remi import RemiRequest
@@ -8,9 +11,12 @@ from nuclia_models.predict.remi import RemiRequest
 
 def test_predict(testing_config):
     np = NucliaPredict()
-    embed = np.sentence(text="This is my text", model="multilingual-2024-05-06")
+    embed = np.sentence(
+        text="This is my text", model="multilingual-2024-05-06", show_consumption=True
+    )
     assert embed.time > 0
     assert len(embed.data) == 1024
+    assert embed.consumption is not None
 
 
 def test_predict_query(testing_config):
@@ -20,11 +26,14 @@ def test_predict_query(testing_config):
         semantic_model="multilingual-2024-05-06",
         token_model="multilingual",
         generative_model="chatgpt-azure-4o-mini",
+        show_consumption=True,
     )
     assert query.language == "en"
     assert query.visual_llm is True
     assert query.entities and query.entities.tokens[0].text == "Ramon"
     assert query.sentence and len(query.sentence.data) == 1024
+    assert query.entities.consumption is not None
+    assert query.sentence.consumption is not None
 
 
 def test_rag(testing_config):
@@ -36,14 +45,34 @@ def test_rag(testing_config):
             "Eudald Camprubí is CEO at the same company as Ramon Navarro",
         ],
         model="chatgpt-azure-4o-mini",
+        show_consumption=True,
     )
     assert "Eudald" in generated.answer
+    assert generated.consumption is not None
 
 
 def test_generative(testing_config):
     np = NucliaPredict()
     generated = np.generate(text="How much is 2 + 2?", model="chatgpt-azure-4o-mini")
     assert "4" in generated.answer
+    assert generated.consumption is None
+
+
+@pytest.mark.asyncio
+async def test_generative_with_consumption(testing_config):
+    np = NucliaPredict()
+    generated = np.generate(
+        text="How much is 2 + 2?", model="chatgpt-azure-4o-mini", show_consumption=True
+    )
+    assert "4" in generated.answer
+    assert generated.consumption is not None
+
+    anp = AsyncNucliaPredict()
+    async_generated = await anp.generate(
+        text="How much is 2 + 2?", model="chatgpt-azure-4o-mini", show_consumption=True
+    )
+    assert "4" in async_generated.answer
+    assert async_generated.consumption is not None
 
 
 @pytest.mark.asyncio
@@ -70,13 +99,18 @@ def test_stream_generative(testing_config):
 @pytest.mark.asyncio
 async def test_async_stream_generative(testing_config):
     np = AsyncNucliaPredict()
+    consumption_found = False
+    found = False
     async for stream in np.generate_stream(
-        text="How much is 2 + 2?", model="chatgpt-azure-4o-mini"
+        text="How much is 2 + 2?", model="chatgpt-azure-4o-mini", show_consumption=True
     ):
         if isinstance(stream.chunk, TextGenerativeResponse) and stream.chunk.text:
             if "4" in stream.chunk.text:
                 found = True
+        elif isinstance(stream.chunk, ConsumptionGenerative):
+            consumption_found = True
     assert found
+    assert consumption_found
 
 
 SCHEMA = {
@@ -148,6 +182,8 @@ def test_nua_remi(testing_config):
     assert results.context_relevance[1] < 2
     assert results.groundedness[1] < 2
 
+    assert results.consumption is None
+
 
 @pytest.mark.asyncio
 async def test_nua_async_remi(testing_config):
@@ -161,7 +197,8 @@ async def test_nua_async_remi(testing_config):
                 "Paris is the capital of France.",
                 "Berlin is the capital of Germany.",
             ],
-        )
+        ),
+        show_consumption=True,
     )
     assert results.answer_relevance.score >= 4
 
@@ -170,3 +207,54 @@ async def test_nua_async_remi(testing_config):
 
     assert results.context_relevance[1] < 2
     assert results.groundedness[1] < 2
+
+    assert results.consumption is not None
+
+
+def test_nua_rerank(testing_config):
+    np = NucliaPredict()
+    results = np.rerank(
+        RerankModel(
+            user_id="Nuclia PY CLI",
+            question="What is the capital of France?",
+            context={
+                "1": "Paris is the capital of France.",
+                "2": "Berlin is the capital of Germany.",
+            },
+        )
+    )
+    assert results.context_scores["1"] > results.context_scores["2"]
+    assert results.consumption is None
+
+
+@pytest.mark.asyncio
+async def test_nua_rerank_with_consumption(testing_config):
+    np = NucliaPredict()
+    results = np.rerank(
+        RerankModel(
+            user_id="Nuclia PY CLI",
+            question="What is the capital of France?",
+            context={
+                "1": "Paris is the capital of France.",
+                "2": "Berlin is the capital of Germany.",
+            },
+        ),
+        show_consumption=True,
+    )
+    assert results.context_scores["1"] > results.context_scores["2"]
+    assert results.consumption is not None
+
+    anp = AsyncNucliaPredict()
+    async_results = await anp.rerank(
+        RerankModel(
+            user_id="Nuclia PY CLI",
+            question="What is the capital of France?",
+            context={
+                "1": "Paris is the capital of France.",
+                "2": "Berlin is the capital of Germany.",
+            },
+        ),
+        show_consumption=True,
+    )
+    assert async_results.context_scores["1"] > async_results.context_scores["2"]
+    assert async_results.consumption is not None

{nuclia-4.9.2.dist-info → nuclia-4.9.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: nuclia
-Version: 4.9.2
+Version: 4.9.4
 Summary: Nuclia Python SDK
 Author-email: Nuclia <info@nuclia.com>
 License-Expression: MIT
@@ -24,9 +24,9 @@ Requires-Dist: requests
 Requires-Dist: httpx
 Requires-Dist: httpcore>=1.0.0
 Requires-Dist: prompt_toolkit
-Requires-Dist: nucliadb_sdk<7,>=6.5
-Requires-Dist: nucliadb_models<7,>=6.5
-Requires-Dist: nuclia-models>=0.41.1
+Requires-Dist: nucliadb_sdk<7,>=6.6.1
+Requires-Dist: nucliadb_models<7,>=6.6.1
+Requires-Dist: nuclia-models>=0.45.0
 Requires-Dist: tqdm
 Requires-Dist: aiofiles
 Requires-Dist: backoff

{nuclia-4.9.2.dist-info → nuclia-4.9.4.dist-info}/RECORD

@@ -9,11 +9,11 @@ nuclia/cli/run.py,sha256=B1hP0upSbSCqqT89WAwsd93ZxkAoF6ajVyLOdYmo8fU,1560
 nuclia/cli/utils.py,sha256=iZ3P8juBdAGvaRUd2BGz7bpUXNDHdPrC5p876yyZ2Cs,1223
 nuclia/lib/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nuclia/lib/conversations.py,sha256=M6qhL9NPEKroYF767S-Q2XWokRrjX02kpYTzRvZKwUE,149
-nuclia/lib/kb.py,sha256=vSLfmV6HqPvWJwPVw4iIzkDnm0M96_ImTH3QMZdkd_I,30985
+nuclia/lib/kb.py,sha256=hbWg-0pX1OCt9ezUXYcOfyWHahgmZLUQe2nlSycHetU,31364
 nuclia/lib/models.py,sha256=ekEQrVIFU3aFvt60yQh-zpWkGNORBMSc7c5Hd_VzPzI,1564
-nuclia/lib/nua.py,sha256=sUVFdCjvLigTqUUhILywdHpiC0qKCtKPABn5kUXfuxQ,27064
+nuclia/lib/nua.py,sha256=qP6Gv9ck117kdqNuKVl_qHodrDE8CS8xdh_bdzeJMiQ,30631
 nuclia/lib/nua_chat.py,sha256=ApL1Y1FWvAVUt-Y9a_8TUSJIhg8-UmBSy8TlDPn6tD8,3874
-nuclia/lib/nua_responses.py,sha256=RJB7bbgZEpYr29aOmaT2nb1X0g6wds4MOngq7N-ZcTg,13382
+nuclia/lib/nua_responses.py,sha256=KHAjoW3fu2QT7u4F4WfL4DQIM8lCE5W_14vuRtCmtZg,13970
 nuclia/lib/utils.py,sha256=9l6DxBk-11WqUhXRn99cqeuVTUOJXj-1S6zckal7wOk,6312
 nuclia/sdk/__init__.py,sha256=-nAw8i53XBdmbfTa1FJZ0FNRMNakimDVpD6W4OdES-c,1374
 nuclia/sdk/accounts.py,sha256=7XQ3K9_jlSuk2Cez868FtazZ05xSGab6h3Mt1qMMwIE,647
@@ -22,17 +22,17 @@ nuclia/sdk/auth.py,sha256=o9CiWt3P_UHQW_L5Jq_9IOB-KpSCXFsVTouQcZp8BJM,25072
 nuclia/sdk/backup.py,sha256=adbPcNEbHGZW698o028toXKfDkDrmk5QRIDSiN6SPys,6529
 nuclia/sdk/export_import.py,sha256=y5cTOxhILwRPIvR2Ya12bk-ReGbeDzA3C9TPxgnOHD4,9756
 nuclia/sdk/extract_strategy.py,sha256=NZBLLThdLyQYw8z1mT9iRhFjkE5sQP86-3QhsTiyV9o,2540
-nuclia/sdk/kb.py,sha256=2-H9FOvPgsG-ZYNUA8D4FYAJhX3K8m2VwbwSQy1JV7c,27044
+nuclia/sdk/kb.py,sha256=rY1yVx_9S01twMXgrkpKSNpPChTupwYEw7EAIOwzLYA,27321
 nuclia/sdk/kbs.py,sha256=nXEvg5ddZYdDS8Kie7TrN-s1meU9ecYLf9FlT5xr-ro,9131
 nuclia/sdk/logger.py,sha256=UHB81eS6IGmLrsofKxLh8cmF2AsaTj_HXP0tGqMr_HM,57
 nuclia/sdk/logs.py,sha256=3jfORpo8fzZiXFFSbGY0o3Bre1ZgJaKQCXgxP1keNHw,9614
 nuclia/sdk/nua.py,sha256=6t0m0Sx-UhqNU2Hx9v6vTwy0m3a30K4T0KmP9G43MzY,293
 nuclia/sdk/nucliadb.py,sha256=bOESIppPgY7IrNqrYY7T3ESoxwttbOSTm5zj1xUS1jI,1288
-nuclia/sdk/predict.py,sha256=KF7iT2aasaB9DIEAwqktXbOl2H_Y_ne-6-SEErN7YOk,9095
+nuclia/sdk/predict.py,sha256=ZQMtoeQBXaPuaJRxOmO23nnKkVKRpNCMi0JgXWSJ9lM,12836
 nuclia/sdk/process.py,sha256=WuNnqaWprp-EABWDC_z7O2woesGIlYWnDUKozh7Ibr4,2241
 nuclia/sdk/remi.py,sha256=BEb3O9R2jOFlOda4vjFucKKGO1c2eTkqYZdFlIy3Zmo,4357
 nuclia/sdk/resource.py,sha256=0lSvD4e1FpN5iM9W295dOKLJ8hsXfIe8HKdo0HsVg20,13976
-nuclia/sdk/search.py,sha256=1mLJzDO-W3ObReDL1xK8zgjIxkdpuIhyf87-L4bISKQ,25180
+nuclia/sdk/search.py,sha256=tHpx0gwVwSepa3dn7AX2iWs7JO0pQkjJk7v8TEoL7Gg,27742
 nuclia/sdk/task.py,sha256=UawH-7IneRIGVOiLdDQ2vDBwe5eI51UXRbLRRVeu3C4,6095
 nuclia/sdk/upload.py,sha256=ZBzYROF3yP-77HcaR06OBsFjJAbTOCvF-nlxaqQZsT4,22720
 nuclia/sdk/zones.py,sha256=1ARWrTsTuzj8zguanpX3OaIw-3Qq_ULS_g4GG2mHxOA,342
@@ -49,7 +49,7 @@ nuclia/tests/test_kb/test_labels.py,sha256=IUdTq4mzv0OrOkwBWWy4UwKGKyJybtoHrgvXr
 nuclia/tests/test_kb/test_logs.py,sha256=Z9ELtiiU9NniITJzeWt92GCcERKYy9Nwc_fUVPboRU0,3121
 nuclia/tests/test_kb/test_remi.py,sha256=OX5N-MHbgcwpLg6fBjrAK_KhqkMspJo_VKQHCBCayZ8,2080
 nuclia/tests/test_kb/test_resource.py,sha256=05Xgmg5fwcPW2PZKnUSSjr6MPXp5w8XDgx8plfNcR68,1102
-nuclia/tests/test_kb/test_search.py,sha256=bsQhfB6-NYFwY3gqkrVJJnru153UgZqEhV22ho4VeWM,4660
+nuclia/tests/test_kb/test_search.py,sha256=8v3u-VcczBCTc-rHlWVM5mUtLJKNBZSM0V4v2I1uE3E,4751
 nuclia/tests/test_kb/test_tasks.py,sha256=tfJl1js2o0_dKyXdOxiwdj929kbzMkfl5XjO8HVMInQ,3456
 nuclia/tests/test_manage/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nuclia/tests/test_manage/test_account.py,sha256=u9NhRK8gJLS7BEY618aGoYoV2rgDLHZUeSsWWYkDhF8,289
@@ -57,15 +57,15 @@ nuclia/tests/test_manage/test_auth.py,sha256=I5ho9rKhrzCiP57cDVcs2zrXyy1uWlKxzfE
 nuclia/tests/test_manage/test_kb.py,sha256=gqBMxmIuPUKC6kP2V_IapS9u72QR99V8CDQlJOa8sHU,1959
 nuclia/tests/test_nua/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nuclia/tests/test_nua/test_agent.py,sha256=iPA8lVw7CyONS-0fVG7rDzv8T-LnUlNPMNynTnP-2ic,334
-nuclia/tests/test_nua/test_predict.py,sha256=SKASYohoZgDGHoVQsS2_jFwXVdMFU6REh5Suw8okIHQ,5347
+nuclia/tests/test_nua/test_predict.py,sha256=EKgpvHZHA4pf3ENE17j0B7CKewqHeJryR7D8JSTGJMo,8154
 nuclia/tests/test_nucliadb/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nuclia/tests/test_nucliadb/test_crud.py,sha256=GuY76HRvt2DFaNgioKm5n0Aco1HnG7zzV_zKom5N8xc,1173
 nuclia/tests/unit/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 nuclia/tests/unit/test_export_import.py,sha256=xo_wVbjUnNlVV65ZGH7LtZ38qy39EkJp2hjOuTHC1nU,980
 nuclia/tests/unit/test_nua_responses.py,sha256=t_hIdVztTi27RWvpfTJUYcCL0lpKdZFegZIwLdaPNh8,319
-nuclia-4.9.2.dist-info/licenses/LICENSE,sha256=Ops2LTti_HJtpmWcanuUTdTY3vKDR1myJ0gmGBKC0FA,1063
-nuclia-4.9.2.dist-info/METADATA,sha256=QqBc1WyVh98_k_OuLTJBoD5_Ig5VZuQ5ewQZIriu9p0,2337
-nuclia-4.9.2.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-nuclia-4.9.2.dist-info/entry_points.txt,sha256=iZHOyXPNS54r3eQmdi5So20xO1gudI9K2oP4sQsCJRw,46
-nuclia-4.9.2.dist-info/top_level.txt,sha256=cqn_EitXOoXOSUvZnd4q6QGrhm04pg8tLAZtem-Zfdo,7
-nuclia-4.9.2.dist-info/RECORD,,
+nuclia-4.9.4.dist-info/licenses/LICENSE,sha256=Ops2LTti_HJtpmWcanuUTdTY3vKDR1myJ0gmGBKC0FA,1063
+nuclia-4.9.4.dist-info/METADATA,sha256=2fk95GmG2Qa-GGAOPxWXWgA-gAGv-vEIHMRftKOsgA0,2341
+nuclia-4.9.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+nuclia-4.9.4.dist-info/entry_points.txt,sha256=iZHOyXPNS54r3eQmdi5So20xO1gudI9K2oP4sQsCJRw,46
+nuclia-4.9.4.dist-info/top_level.txt,sha256=cqn_EitXOoXOSUvZnd4q6QGrhm04pg8tLAZtem-Zfdo,7
+nuclia-4.9.4.dist-info/RECORD,,