From dfa3198314c6b2dd056535f379b5005c9b7760bf Mon Sep 17 00:00:00 2001
From: Alexander Song <axiomofjoy@gmail.com>
Date: Sun, 27 Apr 2025 18:16:33 -0700
Subject: [PATCH 1/3] feat(datasets): support json dataset upload via the ui

---
 .../pages/datasets/DatasetFromJSONForm.tsx    | 249 ++++++++++++++++++
 app/src/pages/datasets/DatasetsPage.tsx       |  36 +++
 2 files changed, 285 insertions(+)
 create mode 100644 app/src/pages/datasets/DatasetFromJSONForm.tsx

diff --git a/app/src/pages/datasets/DatasetFromJSONForm.tsx b/app/src/pages/datasets/DatasetFromJSONForm.tsx
new file mode 100644
index 0000000000..35cd0c70d4
--- /dev/null
+++ b/app/src/pages/datasets/DatasetFromJSONForm.tsx
@@ -0,0 +1,249 @@
+import React, { useCallback, useState } from "react";
+import { Controller, useForm } from "react-hook-form";
+import { css } from "@emotion/react";
+
+import {
+  Button,
+  FieldError,
+  Flex,
+  Form,
+  Input,
+  Label,
+  Text,
+  TextArea,
+  TextField,
+  View,
+} from "@phoenix/components";
+import { JSONBlock } from "@phoenix/components/code";
+import { prependBasename } from "@phoenix/utils/routingUtils";
+
+type CreateDatasetFromJSONParams = {
+  file: FileList;
+  name: string;
+  description: string;
+};
+
+type JsonData = {
+  name: string;
+  description: string;
+  inputs: Record<string, unknown>[];
+  outputs: Record<string, unknown>[];
+  metadata: Record<string, unknown>[];
+};
+
+export type CreateDatasetFromJSONFormProps = {
+  onDatasetCreated: (dataset: { id: string; name: string }) => void;
+  onDatasetCreateError: (error: Error) => void;
+};
+
+export function DatasetFromJSONForm(props: CreateDatasetFromJSONFormProps) {
+  const { onDatasetCreated, onDatasetCreateError } = props;
+  const [jsonData, setJsonData] = useState<JsonData | null>(null);
+  const {
+    control,
+    handleSubmit,
+    formState: { isDirty, isValid },
+  } = useForm<CreateDatasetFromJSONParams>({
+    defaultValues: {
+      name: "Dataset " + new Date().toISOString(),
+      description: "",
+      file: undefined,
+    },
+  });
+
+  const onSubmit = useCallback(
+    (data: CreateDatasetFromJSONParams) => {
+      if (!jsonData) {
+        onDatasetCreateError(new Error("No JSON data available"));
+        return;
+      }
+
+      return fetch(prependBasename("/v1/datasets/upload?sync=true"), {
+        method: "POST",
+        headers: {
+          "Content-Type": "application/json",
+        },
+        body: JSON.stringify({
+          ...jsonData,
+          name: data.name,
+          description: data.description,
+        }),
+      })
+        .then((response) => {
+          if (!response.ok) {
+            throw new Error(response.statusText || "Failed to create dataset");
+          }
+          return response.json();
+        })
+        .then((res) => {
+          onDatasetCreated({
+            name: data.name,
+            id: res["data"]["dataset_id"],
+          });
+        })
+        .catch((error) => {
+          onDatasetCreateError(error);
+        });
+    },
+    [onDatasetCreateError, onDatasetCreated, jsonData]
+  );
+
+  return (
+    <Form onSubmit={handleSubmit(onSubmit)}>
+      <div
+        css={css`
+          padding: var(--ac-global-dimension-size-200);
+        `}
+      >
+        <Controller
+          name="name"
+          control={control}
+          rules={{
+            required: "field is required",
+          }}
+          render={({
+            field: { onChange, onBlur, value },
+            fieldState: { invalid, error },
+          }) => (
+            <TextField
+              isInvalid={invalid}
+              onChange={onChange}
+              onBlur={onBlur}
+              value={value.toString()}
+            >
+              <Label>Dataset Name</Label>
+              <Input placeholder="e.x. Golden Dataset" />
+              {error?.message ? (
+                <FieldError>{error.message}</FieldError>
+              ) : (
+                <Text slot="description">The name of the dataset</Text>
+              )}
+            </TextField>
+          )}
+        />
+        <Controller
+          name="description"
+          control={control}
+          render={({
+            field: { onChange, onBlur, value },
+            fieldState: { invalid, error },
+          }) => (
+            <TextField
+              isInvalid={invalid}
+              onChange={onChange}
+              onBlur={onBlur}
+              value={value.toString()}
+            >
+              <Label>Description</Label>
+              <TextArea placeholder="e.x. A dataset for structured data extraction" />
+              {error?.message ? (
+                <FieldError>{error.message}</FieldError>
+              ) : (
+                <Text slot="description">The description of the dataset</Text>
+              )}
+            </TextField>
+          )}
+        />
+        <Controller
+          control={control}
+          name="file"
+          rules={{ required: "JSON file is required" }}
+          render={({
+            field: { value: _value, onChange, ...field },
+            fieldState: { invalid, error },
+          }) => {
+            return (
+              <TextField isInvalid={invalid}>
+                <Label>JSON file</Label>
+                <input
+                  {...field}
+                  onChange={(event) => {
+                    onChange(event.target.files);
+                    const file = event.target.files?.[0];
+                    if (file) {
+                      const reader = new FileReader();
+                      reader.onload = function (e) {
+                        if (!e.target) {
+                          return;
+                        }
+                        try {
+                          const parsedData = JSON.parse(
+                            e.target.result as string
+                          );
+                          setJsonData(parsedData);
+                        } catch (error) {
+                          onDatasetCreateError(
+                            new Error(
+                              "Invalid JSON file: " + (error as Error).message
+                            )
+                          );
+                        }
+                      };
+                      reader.readAsText(file);
+                    }
+                  }}
+                  type="file"
+                  id="file"
+                  accept=".json"
+                />
+                {error?.message ? (
+                  <FieldError>{error.message}</FieldError>
+                ) : (
+                  <Text slot="description">Upload a JSON file.</Text>
+                )}
+              </TextField>
+            );
+          }}
+        />
+        <div
+          css={css`
+            margin-top: var(--ac-global-dimension-size-200);
+          `}
+        >
+          <Text>Example JSON file:</Text>
+          <JSONBlock
+            value={JSON.stringify(
+              {
+                inputs: [
+                  {
+                    question: "What is the format of a JSON dataset file?",
+                  },
+                ],
+                outputs: [
+                  {
+                    answer: "inputs, outputs, and metadata as lists of objects",
+                  },
+                ],
+                metadata: [
+                  {
+                    hint: "outputs and metadata are optional",
+                  },
+                ],
+              },
+              null,
+              2
+            )}
+          />
+        </div>
+      </div>
+      <View
+        paddingEnd="size-200"
+        paddingTop="size-100"
+        paddingBottom="size-100"
+        borderTopColor="light"
+        borderTopWidth="thin"
+      >
+        <Flex direction="row" justifyContent="end">
+          <Button
+            type="submit"
+            isDisabled={!isValid || !jsonData}
+            variant={isDirty ? "primary" : "default"}
+            size="S"
+          >
+            Create Dataset
+          </Button>
+        </Flex>
+      </View>
+    </Form>
+  );
+}
diff --git a/app/src/pages/datasets/DatasetsPage.tsx b/app/src/pages/datasets/DatasetsPage.tsx
index feffa85f5d..5fafc9b1fa 100644
--- a/app/src/pages/datasets/DatasetsPage.tsx
+++ b/app/src/pages/datasets/DatasetsPage.tsx
@@ -11,6 +11,7 @@ import { getErrorMessagesFromRelayMutationError } from "@phoenix/utils/errorUtil
 
 import { DatasetsPageQuery } from "./__generated__/DatasetsPageQuery.graphql";
 import { DatasetFromCSVForm } from "./DatasetFromCSVForm";
+import { DatasetFromJSONForm } from "./DatasetFromJSONForm";
 import { DatasetsTable } from "./DatasetsTable";
 
 export function DatasetsPage() {
@@ -64,6 +65,7 @@ type CreateDatasetActionMenu = {
 enum CreateDatasetAction {
   NEW = "newDataset",
   FROM_CSV = "datasetFromCSV",
+  FROM_JSON = "datasetFromJSON",
 }
 
 function CreateDatasetActionMenu({
@@ -133,6 +135,36 @@ function CreateDatasetActionMenu({
       </Dialog>
     );
   };
+  const onCreateDatasetFromJSON = () => {
+    setDialog(
+      <Dialog size="M" title="New Dataset from JSON">
+        <DatasetFromJSONForm
+          onDatasetCreated={(newDataset) => {
+            notifySuccess({
+              title: "Dataset created",
+              message: `${newDataset.name} has been successfully created.`,
+              action: {
+                text: "Go to Dataset",
+                onClick: () => {
+                  navigate(`/datasets/${newDataset.id}`);
+                },
+              },
+            });
+            setDialog(null);
+            onDatasetCreated();
+          }}
+          onDatasetCreateError={(error) => {
+            const formattedError =
+              getErrorMessagesFromRelayMutationError(error);
+            notifyError({
+              title: "Dataset creation failed",
+              message: formattedError?.[0] ?? error.message,
+            });
+          }}
+        />
+      </Dialog>
+    );
+  };
   return (
     <>
       <ActionMenu
@@ -147,11 +179,15 @@ function CreateDatasetActionMenu({
             case CreateDatasetAction.FROM_CSV:
               onCreateDatasetFromCSV();
               break;
+            case CreateDatasetAction.FROM_JSON:
+              onCreateDatasetFromJSON();
+              break;
           }
         }}
       >
         <Item key={CreateDatasetAction.NEW}>New Dataset</Item>
         <Item key={CreateDatasetAction.FROM_CSV}>Dataset from CSV</Item>
+        <Item key={CreateDatasetAction.FROM_JSON}>Dataset from JSON</Item>
       </ActionMenu>
       <DialogContainer
         type="modal"

From 931feba4b71d2c38a962478865931d350da8bff4 Mon Sep 17 00:00:00 2001
From: Alexander Song <axiomofjoy@gmail.com>
Date: Mon, 28 Apr 2025 10:44:47 -0700
Subject: [PATCH 2/3] clean

---
 app/src/pages/datasets/DatasetFromCSVForm.tsx  |  4 ++--
 app/src/pages/datasets/DatasetFromJSONForm.tsx | 13 ++++++-------
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/app/src/pages/datasets/DatasetFromCSVForm.tsx b/app/src/pages/datasets/DatasetFromCSVForm.tsx
index 8c15bf8c64..bb4b4f6566 100644
--- a/app/src/pages/datasets/DatasetFromCSVForm.tsx
+++ b/app/src/pages/datasets/DatasetFromCSVForm.tsx
@@ -131,7 +131,7 @@ export function DatasetFromCSVForm(props: CreateDatasetFromCSVFormProps) {
               value={value.toString()}
             >
               <Label>Dataset Name</Label>
-              <Input placeholder="e.x. Golden Dataset" />
+              <Input placeholder="e.g., Golden Dataset" />
               {error?.message ? (
                 <FieldError>{error.message}</FieldError>
               ) : (
@@ -154,7 +154,7 @@ export function DatasetFromCSVForm(props: CreateDatasetFromCSVFormProps) {
               value={value.toString()}
             >
               <Label>Description</Label>
-              <TextArea placeholder="e.x. A dataset for structured data extraction" />
+              <TextArea placeholder="e.g., A dataset for structured data extraction" />
               {error?.message ? (
                 <FieldError>{error.message}</FieldError>
               ) : (
diff --git a/app/src/pages/datasets/DatasetFromJSONForm.tsx b/app/src/pages/datasets/DatasetFromJSONForm.tsx
index 35cd0c70d4..ed681a8663 100644
--- a/app/src/pages/datasets/DatasetFromJSONForm.tsx
+++ b/app/src/pages/datasets/DatasetFromJSONForm.tsx
@@ -54,7 +54,7 @@ export function DatasetFromJSONForm(props: CreateDatasetFromJSONFormProps) {
   const onSubmit = useCallback(
     (data: CreateDatasetFromJSONParams) => {
       if (!jsonData) {
-        onDatasetCreateError(new Error("No JSON data available"));
+        onDatasetCreateError(new Error("No JSON file has been uploaded"));
         return;
       }
 
@@ -71,7 +71,9 @@ export function DatasetFromJSONForm(props: CreateDatasetFromJSONFormProps) {
       })
         .then((response) => {
           if (!response.ok) {
-            throw new Error(response.statusText || "Failed to create dataset");
+            throw onDatasetCreateError(
+              new Error(response.statusText || "Failed to create dataset")
+            );
           }
           return response.json();
         })
@@ -80,9 +82,6 @@ export function DatasetFromJSONForm(props: CreateDatasetFromJSONFormProps) {
             name: data.name,
             id: res["data"]["dataset_id"],
           });
-        })
-        .catch((error) => {
-          onDatasetCreateError(error);
         });
     },
     [onDatasetCreateError, onDatasetCreated, jsonData]
@@ -112,7 +111,7 @@ export function DatasetFromJSONForm(props: CreateDatasetFromJSONFormProps) {
               value={value.toString()}
             >
               <Label>Dataset Name</Label>
-              <Input placeholder="e.x. Golden Dataset" />
+              <Input placeholder="e.g., Golden Dataset" />
               {error?.message ? (
                 <FieldError>{error.message}</FieldError>
               ) : (
@@ -135,7 +134,7 @@ export function DatasetFromJSONForm(props: CreateDatasetFromJSONFormProps) {
               value={value.toString()}
             >
               <Label>Description</Label>
-              <TextArea placeholder="e.x. A dataset for structured data extraction" />
+              <TextArea placeholder="e.g., A dataset for structured data extraction" />
               {error?.message ? (
                 <FieldError>{error.message}</FieldError>
               ) : (

From 1b761d9cdffedaec0f524afdc853db1b2864fa9b Mon Sep 17 00:00:00 2001
From: Alexander Song <axiomofjoy@gmail.com>
Date: Fri, 2 May 2025 17:57:08 -0700
Subject: [PATCH 3/3] surface error

---
 app/src/pages/datasets/DatasetFromJSONForm.tsx | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/app/src/pages/datasets/DatasetFromJSONForm.tsx b/app/src/pages/datasets/DatasetFromJSONForm.tsx
index ed681a8663..9421db70b5 100644
--- a/app/src/pages/datasets/DatasetFromJSONForm.tsx
+++ b/app/src/pages/datasets/DatasetFromJSONForm.tsx
@@ -71,9 +71,11 @@ export function DatasetFromJSONForm(props: CreateDatasetFromJSONFormProps) {
       })
         .then((response) => {
           if (!response.ok) {
-            throw onDatasetCreateError(
-              new Error(response.statusText || "Failed to create dataset")
-            );
+            return response.text().then((errorText) => {
+              throw onDatasetCreateError(
+                new Error(errorText || "Failed to create dataset")
+              );
+            });
           }
           return response.json();
         })