upgrade hightable

Author: severo

package.json

@@ -55,7 +55,7 @@
     "watch:url": "NODE_ENV=development nodemon bin/cli.js https://hyperparam.blob.core.windows.net/hyperparam/starcoderdata-js-00000-of-00065.parquet"
   },
   "dependencies": {
-    "hightable": "0.17.2",
+    "hightable": "0.18.1",
     "hyparquet": "1.17.1",
     "hyparquet-compressors": "1.1.1",
     "icebird": "0.3.0",

src/components/AvroView/AvroView.tsx

@@ -8,7 +8,7 @@ import styles from '../Json/Json.module.css'
 
 interface ViewerProps {
   source: FileSource
-  setError: (error: Error | undefined) => void
+  setError: (error: unknown) => void
 }
 
 /**
@@ -43,7 +43,7 @@ export default function AvroView({ source, setError }: ViewerProps) {
         setContent({ fileSize })
         setJson(json)
       } catch (error) {
-        setError(error as Error)
+        setError(error)
       } finally {
         setIsLoading(false)
       }

src/components/Cell/Cell.tsx

@@ -39,21 +39,17 @@ export default function CellView({ source, row, col }: CellProps) {
         const metadata = await parquetMetadataAsync(asyncBuffer)
         setProgress(0.75)
         const df = parquetDataFrame(from, metadata)
-        const asyncRows = df.rows({ start: row, end: row + 1 })
-        if (asyncRows.length > 1 || !(0 in asyncRows)) {
-          throw new Error(`Expected 1 row, got ${asyncRows.length}`)
-        }
-        const asyncRow = asyncRows[0]
-        // Await cell data
+
         const columnName = df.header[col]
         if (columnName === undefined) {
           throw new Error(`Column name missing at index col=${col}`)
         }
-        const asyncCell = asyncRow.cells[columnName]
-        if (asyncCell === undefined) {
-          throw new Error(`Cell missing at column ${columnName}`)
+        await df.fetch({ rowStart: row, rowEnd: row + 1, columns: [columnName] })
+        const cell = df.getCell({ row, column: columnName })
+        if (cell === undefined) {
+          throw new Error(`Cell at row=${row}, col=${col} is undefined`)
         }
-        const text = await asyncCell.then(stringify)
+        const text = stringify(cell.value)
         setText(text)
         setError(undefined)
       } catch (error) {

src/components/CellPanel/CellPanel.tsx

@@ -4,9 +4,9 @@ import { useConfig } from '../../hooks/useConfig.js'
 import { cn } from '../../lib/utils.js'
 import ContentWrapper from '../ContentWrapper/ContentWrapper.js'
 import Json from '../Json/Json.js'
+import jsonStyles from '../Json/Json.module.css'
 import SlideCloseButton from '../SlideCloseButton/SlideCloseButton.js'
 import styles from '../TextView/TextView.module.css'
-import jsonStyles from '../Json/Json.module.css'
 
 interface ViewerProps {
   df: DataFrame
@@ -29,21 +29,17 @@ export default function CellPanel({ df, row, col, setProgress, setError, onClose
     async function loadCellData() {
       try {
         setProgress(0.5)
-        const asyncRows = df.rows({ start: row, end: row + 1 })
-        if (asyncRows.length > 1 || !(0 in asyncRows)) {
-          throw new Error(`Expected 1 row, got ${asyncRows.length}`)
-        }
-        const asyncRow = asyncRows[0]
-        // Await cell data
+
         const columnName = df.header[col]
         if (columnName === undefined) {
           throw new Error(`Column name missing at index col=${col}`)
         }
-        const asyncCell = asyncRow.cells[columnName]
-        if (asyncCell === undefined) {
-          throw new Error(`Cell missing at column ${columnName}`)
+        await df.fetch({ rowStart: row, rowEnd: row + 1, columns: [columnName] })
+        const cell = df.getCell({ row, column: columnName })
+        if (cell === undefined) {
+          throw new Error(`Cell at row=${row}, col=${col} is undefined`)
         }
-        const value: unknown = await asyncCell
+        const value: unknown = await cell.value
         if (value instanceof Object && !(value instanceof Date)) {
           setContent(
             <code className={cn(jsonStyles.jsonView, customClass?.jsonView)}>

src/components/File/File.tsx

@@ -1,5 +1,6 @@
-import { useState } from 'react'
+import { useCallback, useState } from 'react'
 import type { FileSource } from '../../lib/sources/types.js'
+import { toError } from '../../lib/utils.js'
 import Breadcrumb from '../Breadcrumb/Breadcrumb.js'
 import Layout from '../Layout/Layout.js'
 import Viewer from '../Viewer/Viewer.js'
@@ -13,10 +14,14 @@ interface FileProps {
  */
 export default function File({ source }: FileProps) {
   const [progress, setProgress] = useState<number>()
-  const [error, setError] = useState<Error>()
+  const [error, setError] = useState<Error | undefined>()
+
+  const setErrorWrapper = useCallback((error: unknown) => {
+    setError(toError(error))
+  }, [setError])
 
   return <Layout progress={progress} error={error} title={source.fileName}>
     <Breadcrumb source={source} />
-    <Viewer source={source} setProgress={setProgress} setError={setError} />
+    <Viewer source={source} setProgress={setProgress} setError={setErrorWrapper} />
   </Layout>
 }

src/components/ImageView/ImageView.tsx

@@ -7,7 +7,7 @@ import styles from './ImageView.module.css'
 
 interface ViewerProps {
   source: FileSource
-  setError: (error: Error | undefined) => void
+  setError: (error: unknown) => void
 }
 
 interface Content {
@@ -45,7 +45,7 @@ export default function ImageView({ source, setError }: ViewerProps) {
         setError(undefined)
       } catch (error) {
         setContent(undefined)
-        setError(error as Error)
+        setError(error)
       } finally {
         setIsLoading(false)
       }

src/components/JsonView/JsonView.tsx

@@ -8,7 +8,7 @@ import styles from '../Json/Json.module.css'
 
 interface ViewerProps {
   source: FileSource
-  setError: (error: Error | undefined) => void
+  setError: (error: unknown) => void
 }
 
 const largeFileSize = 8_000_000 // 8 mb
@@ -48,7 +48,7 @@ export default function JsonView({ source, setError }: ViewerProps) {
         setJson(JSON.parse(text))
       } catch (error) {
         // TODO: show plain text in error case
-        setError(error as Error)
+        setError(error)
       } finally {
         setIsLoading(false)
       }

src/components/MarkdownView/MarkdownView.tsx

@@ -8,7 +8,7 @@ import styles from './MarkdownView.module.css'
 
 interface ViewerProps {
   source: FileSource
-  setError: (error: Error | undefined) => void
+  setError: (error: unknown) => void
 }
 
 /**
@@ -37,7 +37,7 @@ export default function MarkdownView({ source, setError }: ViewerProps) {
         setError(undefined)
         setContent({ text, fileSize })
       } catch (error) {
-        setError(error as Error)
+        setError(error)
         setContent(undefined)
       } finally {
         setIsLoading(false)

src/components/ParquetView/ParquetView.tsx

@@ -1,4 +1,4 @@
-import HighTable, { DataFrame, rowCache } from 'hightable'
+import HighTable, { DataFrame } from 'hightable'
 import 'hightable/src/HighTable.css'
 import { asyncBufferFromUrl, parquetMetadataAsync } from 'hyparquet'
 import React, { useCallback, useEffect, useState } from 'react'
@@ -15,7 +15,7 @@ import styles from './ParquetView.module.css'
 interface ViewerProps {
   source: FileSource
   setProgress: (progress: number | undefined) => void
-  setError: (error: Error | undefined) => void
+  setError: (error: unknown) => void
 }
 
 interface Content extends ContentSize {
@@ -41,12 +41,11 @@ export default function ParquetView({ source, setProgress, setError }: ViewerPro
         const from = { url: resolveUrl, byteLength: asyncBuffer.byteLength, requestInit }
         setProgress(0.66)
         const metadata = await parquetMetadataAsync(asyncBuffer)
-        let dataframe = parquetDataFrame(from, metadata)
-        dataframe = rowCache(dataframe)
+        const dataframe = parquetDataFrame(from, metadata)
         const fileSize = asyncBuffer.byteLength
         setContent({ dataframe, fileSize })
       } catch (error) {
-        setError(error as Error)
+        setError(error)
       } finally {
         setIsLoading(false)
         setProgress(1)

src/components/TextView/TextView.tsx

@@ -7,7 +7,7 @@ import styles from './TextView.module.css'
 
 interface ViewerProps {
   source: FileSource
-  setError: (error: Error | undefined) => void
+  setError: (error: unknown) => void
 }
 
 /**
@@ -36,7 +36,7 @@ export default function TextView({ source, setError }: ViewerProps) {
         setError(undefined)
         setContent({ text, fileSize })
       } catch (error) {
-        setError(error as Error)
+        setError(error)
         setContent(undefined)
       } finally {
         setIsLoading(false)