Skip to content

Commit

Permalink
Add html elements tree in prompt (#731)
Browse files Browse the repository at this point in the history
  • Loading branch information
ykeremy authored Aug 26, 2024
1 parent db25c6a commit 0a9691a
Show file tree
Hide file tree
Showing 3 changed files with 72 additions and 5 deletions.
1 change: 1 addition & 0 deletions skyvern-frontend/src/api/types.ts
Original file line number Diff line number Diff line change
Expand Up @@ -6,6 +6,7 @@ export const ArtifactType = {
LLMResponseParsed: "llm_response_parsed",
VisibleElementsTree: "visible_elements_tree",
VisibleElementsTreeTrimmed: "visible_elements_tree_trimmed",
VisibleElementsTreeInPrompt: "visible_elements_tree_in_prompt",
LLMPrompt: "llm_prompt",
LLMRequest: "llm_request",
HTMLScrape: "html_scrape",
Expand Down
66 changes: 66 additions & 0 deletions skyvern-frontend/src/routes/tasks/detail/HTMLArtifact.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,66 @@
import { artifactApiClient } from "@/api/AxiosClient";
import { ArtifactApiResponse } from "@/api/types";
import { Skeleton } from "@/components/ui/skeleton";
import { Textarea } from "@/components/ui/textarea";
import { useQuery } from "@tanstack/react-query";
import axios from "axios";

// https://stackoverflow.com/a/60338028
function format(html: string) {
const tab = "\t";
let result = "";
let indent = "";

html.split(/>\s*</).forEach(function (element) {
if (element.match(/^\/\w/)) {
indent = indent.substring(tab.length);
}

result += indent + "<" + element + ">\r\n";

if (element.match(/^<?\w[^>]*[^/]$/) && !element.startsWith("input")) {
indent += tab;
}
});

return result.substring(1, result.length - 3);
}

type Props = {
artifact: ArtifactApiResponse;
};

function HTMLArtifact({ artifact }: Props) {
const { data, isFetching, isError, error } = useQuery<string>({
queryKey: ["artifact", artifact.artifact_id],
queryFn: async () => {
if (artifact.uri.startsWith("file://")) {
return artifactApiClient
.get(`/artifact/text`, {
params: {
path: artifact.uri.slice(7),
},
})
.then((response) => response.data);
}
if (artifact.uri.startsWith("s3://") && artifact.signed_url) {
return axios.get(artifact.signed_url).then((response) => response.data);
}
},
});

if (isFetching) {
return <Skeleton className="h-48 w-full" />;
}

return (
<Textarea
className="w-full"
rows={15}
value={isError ? JSON.stringify(error) : format(data ?? "")}
readOnly
/>
);
}

export { HTMLArtifact };
10 changes: 5 additions & 5 deletions skyvern-frontend/src/routes/tasks/detail/StepArtifacts.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@ import { getImageURL } from "./artifactUtils";
import { Input } from "@/components/ui/input";
import { basicTimeFormat } from "@/util/timeFormat";
import { useCredentialGetter } from "@/hooks/useCredentialGetter";

import { HTMLArtifact } from "./HTMLArtifact";
type Props = {
id: string;
stepProps: StepApiResponse;
Expand Down Expand Up @@ -61,9 +61,9 @@ function StepArtifacts({ id, stepProps }: Props) {
(artifact) => artifact.artifact_type === ArtifactType.LLMRequest,
);

const visibleElementsTreeTrimmed = artifacts?.filter(
const visibleElementsTreeInPrompt = artifacts?.find(
(artifact) =>
artifact.artifact_type === ArtifactType.VisibleElementsTreeTrimmed,
artifact.artifact_type === ArtifactType.VisibleElementsTreeInPrompt,
);

const llmPrompt = artifacts?.find(
Expand Down Expand Up @@ -164,8 +164,8 @@ function StepArtifacts({ id, stepProps }: Props) {
)}
</TabsContent>
<TabsContent value="element_tree_trimmed">
{visibleElementsTreeTrimmed ? (
<JSONArtifact artifacts={visibleElementsTreeTrimmed} />
{visibleElementsTreeInPrompt ? (
<HTMLArtifact artifact={visibleElementsTreeInPrompt} />
) : null}
</TabsContent>
<TabsContent value="html_element_tree">
Expand Down

0 comments on commit 0a9691a

Please sign in to comment.