Fix lint

rilldata · Mar 15, 2024 · 024e3a0 · 024e3a0
1 parent 063abdb
commit 024e3a0
Show file tree

Hide file tree

Showing 7 changed files with 34 additions and 55 deletions.
diff --git a/runtime/resolvers/sql_test.go b/runtime/resolvers/sql_test.go
@@ -27,7 +27,7 @@ func TestSimpleSQLApi(t *testing.T) {
 	require.NotNil(t, res)
 
 	var rows []map[string]interface{}
-	require.NoError(t, json.Unmarshal(res, &rows))
+	require.NoError(t, json.Unmarshal(res.Data, &rows))
 	require.Equal(t, 5, len(rows))
 	require.Equal(t, 5, len(rows[0]))
 	require.Equal(t, 4.09, rows[0]["bid_price"])
@@ -54,7 +54,7 @@ func TestTemplateSQLApi(t *testing.T) {
 	require.NotNil(t, res)
 
 	var rows []map[string]interface{}
-	require.NoError(t, json.Unmarshal(res, &rows))
+	require.NoError(t, json.Unmarshal(res.Data, &rows))
 	require.Equal(t, 5, len(rows))
 	require.Equal(t, 5, len(rows[0]))
 	require.Equal(t, 1.81, rows[0]["bid_price"])
@@ -84,7 +84,7 @@ func TestTemplateSQLApi2(t *testing.T) {
 	require.NotNil(t, res)
 
 	var rows []map[string]interface{}
-	require.NoError(t, json.Unmarshal(res, &rows))
+	require.NoError(t, json.Unmarshal(res.Data, &rows))
 	require.Equal(t, 5, len(rows))
 	require.Equal(t, 5, len(rows[0]))
 	require.Equal(t, 4.09, rows[0]["bid_price"])

diff --git a/runtime/server/generate_chart.go b/runtime/server/generate_chart.go
@@ -36,6 +36,9 @@ func (s *Server) GenerateChartSpec(ctx context.Context, req *runtimev1.GenerateC
 		Args:               nil,
 		UserAttributes:     auth.GetClaims(ctx).Attributes(),
 	})
+	if err != nil {
+		return nil, err
+	}
 
 	start := time.Now()
 

diff --git a/web-common/src/features/charts/ChartDisplay.svelte b/web-common/src/features/charts/ChartDisplay.svelte
@@ -49,10 +49,6 @@
     $chartPromptStore.charts[
       getFilePathFromNameAndType(chartName, EntityType.Chart)
     ];
-  $: console.log(
-    getFilePathFromNameAndType(chartName, EntityType.Chart),
-    promptStatus,
-  );
 </script>
 
 <div class="m-2 w-1/2">

diff --git a/web-common/src/features/charts/chartYaml.ts b/web-common/src/features/charts/chartYaml.ts
@@ -0,0 +1,26 @@
+import { Document } from "yaml";
+
+export function getChartYaml(
+  vegaLite: string | undefined,
+  resolver: string | undefined,
+  resolverProperties: Record<string, any> | undefined,
+) {
+  const doc = new Document();
+  doc.set("kind", "chart");
+
+  // TODO: more fields from resolverProperties
+  if (resolver === "SQL") {
+    doc.set("data", { sql: (resolverProperties?.sql as string) ?? "" });
+  } else if (resolver === "MetricsSQL") {
+    doc.set("data", { metrics_sql: (resolverProperties?.sql as string) ?? "" });
+  } else if (resolver === "API") {
+    doc.set("data", { api: (resolverProperties?.api as string) ?? "" });
+  }
+
+  doc.set(
+    "vega_lite",
+    JSON.stringify(JSON.parse(vegaLite ?? "{}"), null, 2).replace(/^/gm, "  "),
+  );
+
+  return doc.toString();
+}
diff --git a/web-common/src/features/charts/prompt/generateChart.spec.ts b/web-common/src/features/charts/prompt/generateChart.spec.ts
@@ -1,4 +1,4 @@
-import { getChartYaml } from "@rilldata/web-common/features/charts/prompt/generateChart";
+import { getChartYaml } from "@rilldata/web-common/features/charts/chartYaml";
 import { describe, it, expect } from "vitest";
 
 const VegaLiteSpec = `{

diff --git a/web-common/src/features/charts/prompt/generateChart.ts b/web-common/src/features/charts/prompt/generateChart.ts
@@ -1,4 +1,5 @@
 import { goto } from "$app/navigation";
+import { getChartYaml } from "@rilldata/web-common/features/charts/chartYaml";
 import {
   ChartPromptStatus,
   chartPromptStore,
@@ -15,7 +16,6 @@ import {
   runtimeServicePutFile,
 } from "@rilldata/web-common/runtime-client";
 import { get } from "svelte/store";
-import { Document } from "yaml";
 
 export function createChartGenerator(instanceId: string, chart: string) {
   const generateVegaConfig = createRuntimeServiceGenerateChartSpec();
@@ -74,9 +74,7 @@ export function createFullChartGenerator(instanceId: string) {
         blob: `kind: chart`,
       });
       chartPromptStore.setStatus(chartPath, ChartPromptStatus.GeneratingData);
-      console.log(chartPath, "...1");
       await goto(getRouteFromName(newChartName, EntityType.Chart));
-      console.log(chartPath, "...2");
       const resolverResp = await get(generateResolver).mutateAsync({
         instanceId,
         data: {
@@ -86,7 +84,6 @@ export function createFullChartGenerator(instanceId: string) {
           prompt,
         },
       });
-      console.log(chartPath, "...3");
 
       // add a chart with just the resolver
       await runtimeServicePutFile(instanceId, chartPath, {
@@ -96,7 +93,6 @@ export function createFullChartGenerator(instanceId: string) {
           resolverResp.resolverProperties,
         ),
       });
-      console.log(chartPath, "...4");
       chartPromptStore.setStatus(
         chartPath,
         ChartPromptStatus.GeneratingChartSpec,
@@ -109,7 +105,6 @@ export function createFullChartGenerator(instanceId: string) {
           resolverProperties: resolverResp.resolverProperties,
         },
       });
-      console.log(chartPath, "...5");
 
       chartPromptStore.deleteStatus(chartPath);
       await runtimeServicePutFile(instanceId, chartPath, {
@@ -124,28 +119,3 @@ export function createFullChartGenerator(instanceId: string) {
     }
   };
 }
-
-export function getChartYaml(
-  vegaLite: string | undefined,
-  resolver: string | undefined,
-  resolverProperties: Record<string, any> | undefined,
-) {
-  const doc = new Document();
-  doc.set("kind", "chart");
-
-  // TODO: more fields from resolverProperties
-  if (resolver === "SQL") {
-    doc.set("data", { sql: (resolverProperties?.sql as string) ?? "" });
-  } else if (resolver === "MetricsSQL") {
-    doc.set("data", { metrics_sql: (resolverProperties?.sql as string) ?? "" });
-  } else if (resolver === "API") {
-    doc.set("data", { api: (resolverProperties?.api as string) ?? "" });
-  }
-
-  doc.set(
-    "vega_lite",
-    JSON.stringify(JSON.parse(vegaLite ?? "{}"), null, 2).replace(/^/gm, "  "),
-  );
-
-  return doc.toString();
-}
diff --git a/web-common/src/features/tables/TableMenuItems.svelte b/web-common/src/features/tables/TableMenuItems.svelte
@@ -54,8 +54,6 @@
     BehaviourEventMedium.Menu,
     MetricsEventSpace.LeftPanel,
   );
-
-  let generateOpen = false;
 </script>
 
 {#if $isModelingSupportedForCurrentOlapDriver.data}
@@ -79,17 +77,3 @@
     <WandIcon class="w-3 h-3" />
   </div>
 </MenuItem>
-<MenuItem
-  icon
-  on:select={() => {
-    generateOpen = true;
-    toggleMenu();
-  }}
-  propogateSelect={false}
->
-  <Explore slot="icon" />
-  <div class="flex gap-x-2 items-center">
-    Generate chart with AI
-    <WandIcon class="w-3 h-3" />
-  </div>
-</MenuItem>