hyperforge-perplexity 1.0.0.post30__tar.gz → 1.0.0.post47__tar.gz

{hyperforge_perplexity-1.0.0.post30 → hyperforge_perplexity-1.0.0.post47}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyperforge_perplexity
-Version: 1.0.0.post30
+Version: 1.0.0.post47
 Summary: Perplexity Hyperforge agent
 Author-email: Nuclia <nucliadb@nuclia.com>
 License-Expression: Apache-2.0
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: <4,>=3.10
+Requires-Python: <4,>=3.12
 Description-Content-Type: text/markdown
 Requires-Dist: hyperforge
 Requires-Dist: httpx

{hyperforge_perplexity-1.0.0.post30 → hyperforge_perplexity-1.0.0.post47}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "hyperforge_perplexity"
-version = "1.0.0.post30"
+version = "1.0.0.post47"
 license = "Apache-2.0"
 description = "Perplexity Hyperforge agent"
 authors = [{ name = "Nuclia", email = "nucliadb@nuclia.com" }]
@@ -17,7 +17,7 @@ classifiers = [
     "Programming Language :: Python :: 3 :: Only",
     "Topic :: Software Development :: Libraries :: Python Modules",
 ]
-requires-python = ">=3.10, <4"
+requires-python = ">=3.12, <4"
 dependencies = [
     "hyperforge",
     "httpx",
@@ -45,3 +45,6 @@ asyncio_mode = "auto"
 
 # Exclude specific files from being packaged
 source-exclude = ["tests/**", "*.pyc"]
+
+[tool.ruff]
+extend = "../../ruff.toml"

{hyperforge_perplexity-1.0.0.post30 → hyperforge_perplexity-1.0.0.post47}/src/hyperforge_perplexity/perplexity.py

@@ -9,6 +9,7 @@ from hyperforge.context.agent import ContextAgent
 from hyperforge.definition import FunctionDefinition
 from hyperforge.manager import Manager
 from hyperforge.memory import Chunk, Context, QuestionMemory
+from hyperforge.models import ExternalUsage
 from hyperforge.utils.http import safe_http_client
 from nuclia.lib.nua_responses import Image
 from perplexity.types import ChatMessageInput
@@ -135,8 +136,6 @@ class PerplexityAgent(ContextAgent, Agent[PerplexityAgentConfig]):
             )
             context.chunks.append(chunk)
 
-        # for chunk in response add to context
-        input_nuclia_tokens = 0
         context.summary = text if text is not None else ""
 
         if (
@@ -147,9 +146,7 @@ class PerplexityAgent(ContextAgent, Agent[PerplexityAgentConfig]):
             questions: List[str] = cast(List[str], response.related_questions)
             memory.add_future_questions(questions)
 
-        # TODO: Report nuclia tokens correctly
-        if response.usage is not None and response.usage.total_tokens is not None:
-            input_nuclia_tokens += response.usage.total_tokens
+        usage = response.usage
 
         await memory.add_step(
             step_module=self.config.module,
@@ -158,8 +155,15 @@ class PerplexityAgent(ContextAgent, Agent[PerplexityAgentConfig]):
             step_agent_path=f"/context/{self.config.id or self.agent_id}",
             step_value=text if text is not None else "",
             timeit=time() - t0,
-            input_nuclia_tokens=input_nuclia_tokens,
-            output_nuclia_tokens=0,
+            external_usage=[
+                ExternalUsage(
+                    provider="perplexity",
+                    model="sonar-pro",
+                    input_tokens=(usage.prompt_tokens or 0) if usage else 0,
+                    output_tokens=(usage.completion_tokens or 0) if usage else 0,
+                    requests=1,
+                )
+            ],
         )
         return context
 

{hyperforge_perplexity-1.0.0.post30 → hyperforge_perplexity-1.0.0.post47}/src/hyperforge_perplexity.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: hyperforge_perplexity
-Version: 1.0.0.post30
+Version: 1.0.0.post47
 Summary: Perplexity Hyperforge agent
 Author-email: Nuclia <nucliadb@nuclia.com>
 License-Expression: Apache-2.0
@@ -13,7 +13,7 @@ Classifier: Programming Language :: Python :: 3.11
 Classifier: Programming Language :: Python :: 3.12
 Classifier: Programming Language :: Python :: 3 :: Only
 Classifier: Topic :: Software Development :: Libraries :: Python Modules
-Requires-Python: <4,>=3.10
+Requires-Python: <4,>=3.12
 Description-Content-Type: text/markdown
 Requires-Dist: hyperforge
 Requires-Dist: httpx

{hyperforge_perplexity-1.0.0.post30 → hyperforge_perplexity-1.0.0.post47}/tests/test_perplexity.py

@@ -8,9 +8,10 @@ from hyperforge.memory import Context
 from hyperforge.memory.memory import EphemeralSessionMemory
 from hyperforge.minimal_fixtures import cassette_nua_key
 from hyperforge.models import MemoryConfig, Rules
+from nuclia.lib.nua import AsyncNuaClient
+
 from hyperforge_perplexity.config import PerplexityAgentConfig
 from hyperforge_perplexity.perplexity import PerplexityAgent
-from nuclia.lib.nua import AsyncNuaClient
 
 NUA_KEY = os.environ.get(
     "NUA_KEY",
@@ -37,7 +38,7 @@ async def _run_question(
     drivers: list[dict],
     question: str,
     config_overrides: dict | None = None,
-) -> list[Context]:
+) -> tuple[list[Context], EphemeralSessionMemory]:
     """Build a manager from driver configs, run the agent, return contexts."""
     load_all_configurations("hyperforge_perplexity")
     # Perplexity agent doesn't use nua — construct client directly with test values
@@ -74,17 +75,25 @@ async def _run_question(
         question=question,
         flow_id=flow_id,
     )
-    return memory.get_agent_contexts(flow_id=flow_id, agent_id=agent.agent_id)
+    return memory.get_agent_contexts(flow_id=flow_id, agent_id=agent.agent_id), memory
 
 
 async def test_perplexity():
-    contexts = await _run_question(
+    contexts, memory = await _run_question(
         DRIVERS,
         "What is Nuclia?",
         config_overrides={"domain": ["nuclia.com"], "related_questions": True},
     )
     assert len(contexts) > 0
     assert any(ctx.chunks for ctx in contexts)
+    usage = next(step.external_usage for step in memory.steps if step.external_usage)
+    assert len(usage) == 1
+    event = usage[0]
+    assert event.provider == "perplexity"
+    assert event.model == "sonar-pro"
+    assert event.input_tokens > 0
+    assert event.output_tokens > 0
+    assert event.requests == 1
 
 
 @pytest.mark.skipif(
@@ -92,7 +101,7 @@ async def test_perplexity():
     reason="Only run when LOCAL_TESTING env var is set.",
 )
 async def test_perplexity_images():
-    contexts = await _run_question(
+    contexts, _ = await _run_question(
         DRIVERS,
         "What colors are 'duppi' usually?",
         config_overrides={"images": True, "related_questions": True},