Terry/better schema (#16)

zhaotai · Terry Zhao · web-flow · commit 50826e8c4841 · 2025-08-15T14:29:10.000-04:00
* better schema

* regenerate

* fix format

* regenerate

* regenerate with fix

* fix

* remove any

* go

* rm re

* fix lin

* upgrade ui

* up

* fix format

---------

Co-authored-by: Terry Zhao &lt;terryzhao@runllama.ai&gt;
diff --git a/.gitignore b/.gitignore
@@ -1,6 +1,8 @@
 test-proj/uv.lock
+.venv
 uv.lock
 expected-proj
+test-proj/.venv
 test-proj/ui/node_modules
 test-proj/ui/pnpm-lock.yaml
 ui/pnpm-lock.yaml
diff --git a/src/{{ project_name_snake }}/export_types.py b/src/{{ project_name_snake }}/export_types.py
@@ -51,7 +51,6 @@ def generate_typescript_interfaces(schema_dir: Path):
     run_command(
         f"npx -y json-schema-to-typescript@15.0.4 -i '{schema_dir / '*.json'}' -o {schema_dir} --additionalProperties=false"
     )
-    run_command(f"npx -y prettier@3.5.1 --write {schema_dir}")
 
 
 def load_module_from_path(module_name: str, file_path: Path) -> ModuleType:
diff --git a/test-proj/src/test_proj/export_types.py b/test-proj/src/test_proj/export_types.py
@@ -51,7 +51,6 @@ def generate_typescript_interfaces(schema_dir: Path):
     run_command(
         f"npx -y json-schema-to-typescript@15.0.4 -i '{schema_dir / '*.json'}' -o {schema_dir} --additionalProperties=false"
     )
-    run_command(f"npx -y prettier@3.5.1 --write {schema_dir}")
 
 
 def load_module_from_path(module_name: str, file_path: Path) -> ModuleType:
diff --git a/test-proj/ui/package.json b/test-proj/ui/package.json
@@ -16,7 +16,7 @@
   "dependencies": {
     "@babel/runtime": "^7.27.6",
     "@lezer/highlight": "^1.2.1",
-    "@llamaindex/ui": "^0.5.0",
+    "@llamaindex/ui": "^0.5.1",
     "@radix-ui/themes": "^3.2.1",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
diff --git a/test-proj/ui/src/lib/client.ts b/test-proj/ui/src/lib/client.ts
@@ -1,6 +1,6 @@
 import { MySchema } from "@/schemas/MySchema";
 import { ExtractedData } from "llama-cloud-services/beta/agent";
-import { ApiClients, JSONObject } from "@llamaindex/ui";
+import { ApiClients } from "@llamaindex/ui";
 import {
   createCloudAgentClient,
   createLlamaDeployClient,
@@ -25,9 +25,7 @@ cloudApiClient.setConfig({
   },
 });
 
-const agentClient = createCloudAgentClient<
-  ExtractedData<MySchema & JSONObject>
->({
+const agentClient = createCloudAgentClient<ExtractedData<MySchema>>({
   baseUrl: apiBaseUrl,
   apiKey: platformToken,
   windowUrl: typeof window !== "undefined" ? window.location.href : undefined,
diff --git a/test-proj/ui/src/pages/ItemPage.tsx b/test-proj/ui/src/pages/ItemPage.tsx
@@ -3,7 +3,6 @@ import {
   AcceptReject,
   ExtractedDataDisplay,
   FilePreview,
-  JSONObject,
   useItemData,
   type Highlight,
 } from "@llamaindex/ui";
@@ -23,7 +22,7 @@ export default function ItemPage() {
   const [highlight, setHighlight] = useState<Highlight | undefined>(undefined);
 
   // Use the hook to fetch item data
-  const itemHookData = useItemData<MySchema & JSONObject>({
+  const itemHookData = useItemData<MySchema>({
     // order/remove fields as needed here
     jsonSchema: modifyJsonSchema(MyJsonSchema as any, {}),
     itemId: itemId as string,
@@ -55,7 +54,7 @@ export default function ItemPage() {
   useEffect(() => {
     setButtons(() => [
       <div className="ml-auto flex items-center">
-        <AcceptReject
+        <AcceptReject<MySchema>
           itemData={itemHookData}
           onComplete={() => navigate("/")}
         />
@@ -116,11 +115,11 @@ export default function ItemPage() {
       <div className="flex-1 bg-white h-full overflow-y-auto">
         <div className="p-4 space-y-4">
           {/* Extracted Data */}
-          <ExtractedDataDisplay<MySchema & JSONObject>
+          <ExtractedDataDisplay<MySchema>
             extractedData={itemData.data}
             title="Extracted Data"
             onChange={(updatedData) => {
-              updateData(updatedData as any);
+              updateData(updatedData);
             }}
             onClickField={(args) => {
               // TODO: set multiple highlights
diff --git a/ui/package.json b/ui/package.json
@@ -16,11 +16,11 @@
   "dependencies": {
     "@babel/runtime": "^7.27.6",
     "@lezer/highlight": "^1.2.1",
-    "@llamaindex/cloud": "^4.0.28",
     "@llamaindex/ui": "file:/Users/terryzhao/work/llama-ui/packages/ui",
     "@radix-ui/themes": "^3.2.1",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
+    "llama-cloud-services": "^0.3.3",
     "lucide-react": "^0.514.0",
     "react": "^18.3.0",
     "react-dom": "^18.3.0",
diff --git a/ui/package.json.jinja b/ui/package.json.jinja
@@ -16,7 +16,7 @@
   "dependencies": {
     "@babel/runtime": "^7.27.6",
     "@lezer/highlight": "^1.2.1",
-    "@llamaindex/ui": "^0.5.0",
+    "@llamaindex/ui": "^0.5.1",
     "@radix-ui/themes": "^3.2.1",
     "class-variance-authority": "^0.7.1",
     "clsx": "^2.1.1",
diff --git a/ui/src/lib/client.ts b/ui/src/lib/client.ts
@@ -1,6 +1,6 @@
 import { MySchema } from "@/schemas/MySchema";
 import { ExtractedData } from "llama-cloud-services/beta/agent";
-import { ApiClients, JSONObject } from "@llamaindex/ui";
+import { ApiClients } from "@llamaindex/ui";
 import {
   createCloudAgentClient,
   createLlamaDeployClient,
@@ -25,9 +25,7 @@ cloudApiClient.setConfig({
   },
 });
 
-const agentClient = createCloudAgentClient<
-  ExtractedData<MySchema & JSONObject>
->({
+const agentClient = createCloudAgentClient<ExtractedData<MySchema>>({
   baseUrl: apiBaseUrl,
   apiKey: platformToken,
   windowUrl: typeof window !== "undefined" ? window.location.href : undefined,
diff --git a/ui/src/pages/ItemPage.tsx b/ui/src/pages/ItemPage.tsx
@@ -3,7 +3,6 @@ import {
   AcceptReject,
   ExtractedDataDisplay,
   FilePreview,
-  JSONObject,
   useItemData,
   type Highlight,
 } from "@llamaindex/ui";
@@ -23,7 +22,7 @@ export default function ItemPage() {
   const [highlight, setHighlight] = useState<Highlight | undefined>(undefined);
 
   // Use the hook to fetch item data
-  const itemHookData = useItemData<MySchema & JSONObject>({
+  const itemHookData = useItemData<MySchema>({
     // order/remove fields as needed here
     jsonSchema: modifyJsonSchema(MyJsonSchema as any, {}),
     itemId: itemId as string,
@@ -55,7 +54,7 @@ export default function ItemPage() {
   useEffect(() => {
     setButtons(() => [
       <div className="ml-auto flex items-center">
-        <AcceptReject
+        <AcceptReject<MySchema>
           itemData={itemHookData}
           onComplete={() => navigate("/")}
         />
@@ -116,11 +115,11 @@ export default function ItemPage() {
       <div className="flex-1 bg-white h-full overflow-y-auto">
         <div className="p-4 space-y-4">
           {/* Extracted Data */}
-          <ExtractedDataDisplay<MySchema & JSONObject>
+          <ExtractedDataDisplay<MySchema>
             extractedData={itemData.data}
             title="Extracted Data"
             onChange={(updatedData) => {
-              updateData(updatedData as any);
+              updateData(updatedData);
             }}
             onClickField={(args) => {
               // TODO: set multiple highlights

Original file line number	Diff line number	Diff line change
`@@ -51,7 +51,6 @@ def generate_typescript_interfaces(schema_dir: Path):`
`51`	`51`	`run_command(`
`52`	`52`	`f"npx -y json-schema-to-typescript@15.0.4 -i '{schema_dir / '*.json'}' -o {schema_dir} --additionalProperties=false"`
`53`	`53`	`)`
`54`		`- run_command(f"npx -y prettier@3.5.1 --write {schema_dir}")`
`55`	`54`
`56`	`55`
`57`	`56`	`def load_module_from_path(module_name: str, file_path: Path) -> ModuleType:`