Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion agents/google/src/hyperforge_google/agent.py
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
from hyperforge.definition import FunctionDefinition
from hyperforge.manager import Manager
from hyperforge.memory.memory import Chunk, Context, QuestionMemory
from hyperforge.models import ExternalUsage
from hyperforge.models import ExternalUsage, ExternalUsageOperation
from hyperforge.utils.http import safe_http_client

from hyperforge_google.config import GoogleAgentConfig
Expand Down Expand Up @@ -161,6 +161,7 @@ async def internet_search(
timeit=time() - t0,
external_usage=[
ExternalUsage(
operation=ExternalUsageOperation.INTERNET_SEARCH,
provider="google",
model=(response.model_version if response is not None else None)
or self.config.gen_model_id,
Expand Down
3 changes: 2 additions & 1 deletion agents/google/tests/test_google.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
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 hyperforge.models import ExternalUsageOperation, MemoryConfig, Rules
from nuclia.lib.nua import AsyncNuaClient

from hyperforge_google.agent import GoogleAgent
Expand Down Expand Up @@ -93,6 +93,7 @@ async def test_google():
usage = next(step.external_usage for step in memory.steps if step.external_usage)
assert len(usage) == 1
event = usage[0]
assert event.operation == ExternalUsageOperation.INTERNET_SEARCH
assert event.provider == "google"
assert event.model == "gemini-2.5-flash"
assert event.input_tokens > 0
Expand Down
3 changes: 2 additions & 1 deletion agents/perplexity/src/hyperforge_perplexity/perplexity.py
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@
from hyperforge.definition import FunctionDefinition
from hyperforge.manager import Manager
from hyperforge.memory import Chunk, Context, QuestionMemory
from hyperforge.models import ExternalUsage
from hyperforge.models import ExternalUsage, ExternalUsageOperation
from hyperforge.utils.http import safe_http_client
from nuclia.lib.nua_responses import Image
from perplexity.types import ChatMessageInput
Expand Down Expand Up @@ -157,6 +157,7 @@ async def internet_search(
timeit=time() - t0,
external_usage=[
ExternalUsage(
operation=ExternalUsageOperation.INTERNET_SEARCH,
provider="perplexity",
model="sonar-pro",
input_tokens=(usage.prompt_tokens or 0) if usage else 0,
Expand Down
3 changes: 2 additions & 1 deletion agents/perplexity/tests/test_perplexity.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
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 hyperforge.models import ExternalUsageOperation, MemoryConfig, Rules
from nuclia.lib.nua import AsyncNuaClient

from hyperforge_perplexity.config import PerplexityAgentConfig
Expand Down Expand Up @@ -89,6 +89,7 @@ async def test_perplexity():
usage = next(step.external_usage for step in memory.steps if step.external_usage)
assert len(usage) == 1
event = usage[0]
assert event.operation == ExternalUsageOperation.INTERNET_SEARCH
assert event.provider == "perplexity"
assert event.model == "sonar-pro"
assert event.input_tokens > 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
from hyperforge.definition import FunctionDefinition
from hyperforge.manager import Manager
from hyperforge.memory import Chunk, Context, QuestionMemory
from hyperforge.models import ExternalUsage
from hyperforge.models import ExternalUsage, ExternalUsageOperation
from hyperforge_perplexity.driver import PerplexityDriver

from hyperforge_perplexity_search.config import PerplexitySearchAgentConfig
Expand Down Expand Up @@ -103,7 +103,12 @@ async def search(
else "No results found",
timeit=time() - t0,
external_usage=[
ExternalUsage(provider="perplexity", model="search", requests=1)
ExternalUsage(
operation=ExternalUsageOperation.INTERNET_SEARCH,
provider="perplexity",
model="search",
requests=1,
)
],
)
return context
Expand Down
3 changes: 2 additions & 1 deletion agents/perplexity_search/tests/test_perplexity_search.py
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
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 hyperforge.models import ExternalUsageOperation, MemoryConfig, Rules
from nuclia.lib.nua import AsyncNuaClient

from hyperforge_perplexity_search.agent import PerplexitySearchAgent
Expand Down Expand Up @@ -83,6 +83,7 @@ async def test_perplexity_search():
usage = next(step.external_usage for step in memory.steps if step.external_usage)
assert len(usage) == 1
event = usage[0]
assert event.operation == ExternalUsageOperation.INTERNET_SEARCH
assert event.provider == "perplexity"
assert event.model == "search"
assert event.input_tokens == 0
Expand Down
8 changes: 8 additions & 0 deletions hyperforge/src/hyperforge/models.py
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
from __future__ import annotations

import uuid
from enum import Enum
from typing import (
Any,
Dict,
Expand Down Expand Up @@ -110,7 +111,14 @@ class VegaLiteVisualization(BaseModel):
Visualization = Union[VegaLiteVisualization]


class ExternalUsageOperation(str, Enum):
INTERNET_SEARCH = "internet_search"


class ExternalUsage(BaseModel):
operation: ExternalUsageOperation = Field(
description="The external operation that generated this usage.",
)
provider: str = Field(
description="The external provider that generated this usage.",
examples=["perplexity", "google", "brave"],
Expand Down
12 changes: 10 additions & 2 deletions hyperforge/tests/models/test_external_usage.py
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,22 @@

from hyperforge.interaction import AragAnswer
from hyperforge.memory.memory import EphemeralSessionMemory
from hyperforge.models import ExternalUsage, MemoryConfig, Rules
from hyperforge.models import ExternalUsage, ExternalUsageOperation, MemoryConfig, Rules


def test_external_usage_defaults_and_roundtrip():
usage = ExternalUsage(provider="google", model="gemini-2.5-flash")
usage = ExternalUsage(
operation=ExternalUsageOperation.INTERNET_SEARCH,
provider="perplexity",
model="search",
)

assert usage.operation == ExternalUsageOperation.INTERNET_SEARCH
assert usage.input_tokens == 0
assert usage.output_tokens == 0
assert usage.requests == 1
assert usage.provider == "perplexity"
assert usage.model == "search"
assert ExternalUsage.model_validate(usage.model_dump()) == usage


Expand All @@ -31,6 +38,7 @@ async def callback(answer: AragAnswer):

memory.set_callback_fn(callback)
usage = ExternalUsage(
operation=ExternalUsageOperation.INTERNET_SEARCH,
provider="perplexity",
model="sonar-pro",
input_tokens=12,
Expand Down
Loading