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
5 changes: 1 addition & 4 deletions src/giskard_hub/data/_base.py
Original file line number Diff line number Diff line change
Expand Up @@ -68,8 +68,5 @@ def to_dict(self) -> Dict[str, Any]:
def maybe_to_dict(data):
if isinstance(data, BaseData):
return data.to_dict()
if isinstance(data, (list, tuple)):
return [maybe_to_dict(item) for item in data]
if isinstance(data, dict):
return {k: maybe_to_dict(v) for k, v in data.items()}

return data
74 changes: 0 additions & 74 deletions src/giskard_hub/data/check.py

This file was deleted.

38 changes: 35 additions & 3 deletions src/giskard_hub/data/conversation.py
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,41 @@
from dataclasses import dataclass, field
from typing import Any, Dict, List, Optional

from ._base import BaseData
from ._entity import Entity
from .chat import ChatMessage, ChatMessageWithMetadata
from .check import CheckConfig, _format_checks_to_cli


def _format_checks_to_cli(checks: List[TestCaseCheckConfig]) -> List[CheckConfig]:
return [
{
"identifier": check["identifier"],
"enabled": check["enabled"],
**(
{"params": params}
if check.get("assertions")
and (
params := {
k: v for k, v in check["assertions"][0].items() if k != "type"
}
)
else {}
),
}
for check in checks
]


@dataclass
class CheckConfig(BaseData):
identifier: str
params: Optional[dict[str, Any]] = None


@dataclass
class TestCaseCheckConfig(BaseData):
identifier: str
assertions: List[dict[str, Any]]


@dataclass
Expand All @@ -20,14 +52,14 @@ class Conversation(Entity):
Output of the agent for demonstration purposes.
tags : List[str], optional
List of tags for the conversation.
checks : List[CheckConfig], optional
checks : List[TestCaseCheckConfig], optional
List of checks to be performed on the conversation.
"""

messages: List[ChatMessage] = field(default_factory=list)
demo_output: Optional[ChatMessageWithMetadata] = field(default=None)
tags: List[str] = field(default_factory=list)
checks: List[CheckConfig] = field(default_factory=list)
checks: List[TestCaseCheckConfig] = field(default_factory=list)

@classmethod
def from_dict(cls, data: Dict[str, Any], **kwargs) -> "Conversation":
Expand Down
30 changes: 17 additions & 13 deletions src/giskard_hub/resources/conversations.py
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,24 @@

from ..data._base import NOT_GIVEN, filter_not_given, maybe_to_dict
from ..data.chat import ChatMessage, ChatMessageWithMetadata
from ..data.check import CheckConfig, _format_checks_to_backend
from ..data.conversation import Conversation
from ..data.conversation import CheckConfig, Conversation, TestCaseCheckConfig
from ._resource import APIResource


def _format_checks_to_backend(checks: list[CheckConfig]) -> list[TestCaseCheckConfig]:
return [
{
**check,
**(
{"assertions": [{"type": check["identifier"], **check["params"]}]}
if check.get("params")
else {}
),
}
for check in checks
]


class ConversationsResource(APIResource):
def retrieve(self, conversation_id: str):
return self._client.get(
Expand All @@ -35,9 +48,7 @@ def create(
"messages": [maybe_to_dict(msg) for msg in messages],
"demo_output": maybe_to_dict(demo_output),
"tags": tags,
"checks": [
maybe_to_dict(check) for check in _format_checks_to_backend(checks)
],
"checks": _format_checks_to_backend(checks),
}
)

Expand Down Expand Up @@ -66,14 +77,7 @@ def update(
),
"demo_output": maybe_to_dict(demo_output),
"tags": tags,
"checks": (
[
maybe_to_dict(check)
for check in _format_checks_to_backend(checks)
]
if checks
else checks
),
"checks": _format_checks_to_backend(checks) if checks else checks,
}
)

Expand Down
Loading