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
14 changes: 10 additions & 4 deletions grafi_dev/frontend/index.html
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,9 @@
/>
<script src="https://cdnjs.cloudflare.com/ajax/libs/prism/1.23.0/prism.min.js"></script>
<script src="https://cdnjs.cloudflare.com/ajax/libs/prism/1.23.0/components/prism-yaml.min.js"></script>

<!-- Marked for markdown rendering -->
<script src="https://cdn.jsdelivr.net/npm/marked@4.3.0/marked.min.js"></script>

<style>
body {
Expand Down Expand Up @@ -197,13 +200,15 @@
(e.input_data || []).forEach((m) => {
const b = document.createElement("div");
b.className = "bubble user";
b.textContent = m.content || "";
const content = m.content || "";
b.innerHTML = marked.parse(content);
container.appendChild(b);
});
(e.output_data || []).forEach((m) => {
const b = document.createElement("div");
b.className = "bubble assistant";
b.textContent = m.content || "";
const content = m.content || "";
b.innerHTML = marked.parse(content);
container.appendChild(b);
});
});
Expand Down Expand Up @@ -316,9 +321,10 @@
// build graph & interaction
let cy, wf;
(async () => {
wf = await (await fetch("/workflow")).json();
renderYAML(panes.Info, wf);
assistant_json = await (await fetch("/workflow")).json();
renderYAML(panes.Info, assistant_json);

wf = assistant_json.workflow;
const elems = [];
Object.keys(wf.topics).forEach((t) =>
elems.push({ data: { id: t, label: t, type: "topic" } })
Expand Down
26 changes: 12 additions & 14 deletions grafi_dev/server.py
Original file line number Diff line number Diff line change
Expand Up @@ -40,37 +40,35 @@ def _to_messages(msgs_in: List[MsgIn]) -> Messages:
return [Message(role=m.role, content=m.content) for m in msgs_in]


def _execution_context(conv_id: str, req_id: str):
from grafi.common.models.execution_context import ExecutionContext
def _invoke_context(conv_id: str, req_id: str):
from grafi.common.models.invoke_context import InvokeContext

return ExecutionContext(
return InvokeContext(
conversation_id=conv_id,
assistant_request_id=req_id,
execution_id=uuid.uuid4().hex,
invoke_id=uuid.uuid4().hex,
)


# ---------- conversation helpers ----------------------------------------
def get_conversation_ids():
evs = container.event_store.get_events()
conv_ids = {e.execution_context.conversation_id for e in evs}
conv_ids = {e.invoke_context.conversation_id for e in evs}
return sorted(
conv_ids,
key=lambda conv_id: min(
e.timestamp for e in evs if e.execution_context.conversation_id == conv_id
e.timestamp for e in evs if e.invoke_context.conversation_id == conv_id
),
)


def get_request_ids(conv_id: str):
evs = container.event_store.get_conversation_events(conv_id)
req_ids = {e.execution_context.assistant_request_id for e in evs}
req_ids = {e.invoke_context.assistant_request_id for e in evs}
return sorted(
req_ids,
key=lambda req_id: min(
e.timestamp
for e in evs
if e.execution_context.assistant_request_id == req_id
e.timestamp for e in evs if e.invoke_context.assistant_request_id == req_id
),
)

Expand All @@ -85,14 +83,14 @@ async def chat(req: ChatRequest):
out: Messages = []
if is_async:

async for messages in assistant.a_execute(
_execution_context(req.conversation_id, req.assistant_request_id),
async for messages in assistant.a_invoke(
_invoke_context(req.conversation_id, req.assistant_request_id),
_to_messages(req.messages),
):
out.extend(messages)
else:
out = assistant.execute(
_execution_context(req.conversation_id, req.assistant_request_id),
out = assistant.invoke(
_invoke_context(req.conversation_id, req.assistant_request_id),
_to_messages(req.messages),
)
logger.info(out)
Expand Down
6 changes: 4 additions & 2 deletions pyproject.toml
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,14 @@ build-backend = "setuptools.build_meta"

[project]
name = "grafi-dev"
version = "0.0.4"
version = "0.0.5"
description = "Run a grafi Assistant locally with a live workflow graph & trace viewer"
authors = [{ name = "Craig Li", email = "craig@binome.dev" }]
readme = "README.md"
requires-python = ">=3.10,<3.13"
dependencies = [
"fastapi>=0.115.12",
"grafi>=0.0.16",
"grafi>=0.0.19",
"typer>=0.15.3",
"uvicorn>=0.34.2",
]
Expand All @@ -30,5 +30,7 @@ grafi_dev = ["frontend/*"]

[dependency-groups]
dev = [
"googlesearch-python>=1.3.0",
"pycountry>=24.6.1",
"tavily-python>=0.7.2",
]
Loading