cleanup: remove ChunkMetadataWithFileData struct

devflowinc · Apr 9, 2024 · 1f6c09b · 1f6c09b
1 parent c79aad1
commit 1f6c09b
Show file tree

Hide file tree

Showing 16 changed files with 145 additions and 264 deletions.
diff --git a/search/src/components/BookmarkPopover.tsx b/search/src/components/BookmarkPopover.tsx
@@ -18,7 +18,7 @@ import {
   isChunkGroupPageDTO,
   type ChunkBookmarksDTO,
   type ChunkGroupDTO,
-  type ChunkMetadataWithFileData,
+  type ChunkMetadata,
 } from "../../utils/apiTypes";
 import InputRowsForm from "./Atoms/InputRowsForm";
 import { VsBookmark } from "solid-icons/vs";
@@ -27,7 +27,7 @@ import { A } from "@solidjs/router";
 import { DatasetAndUserContext } from "./Contexts/DatasetAndUserContext";
 
 export interface BookmarkPopoverProps {
-  chunkMetadata: ChunkMetadataWithFileData;
+  chunkMetadata: ChunkMetadata;
   chunkGroups: ChunkGroupDTO[];
   totalGroupPages: number;
   setLoginModal?: Setter<boolean>;

diff --git a/search/src/components/ChunkMetadataDisplay.tsx b/search/src/components/ChunkMetadataDisplay.tsx
@@ -14,7 +14,7 @@ import {
   indirectHasOwnProperty,
   type ChunkBookmarksDTO,
   type ChunkGroupDTO,
-  ChunkMetadataWithFileData,
+  ChunkMetadata,
 } from "../../utils/apiTypes";
 import { BiRegularChevronDown, BiRegularChevronUp } from "solid-icons/bi";
 import sanitizeHtml from "sanitize-html";
@@ -48,7 +48,7 @@ export interface ChunkMetadataDisplayProps {
   totalGroupPages: number;
   signedInUserId?: string;
   viewingUserId?: string;
-  chunk: ChunkMetadataWithFileData;
+  chunk: ChunkMetadata;
   chunkGroups: ChunkGroupDTO[];
   bookmarks: ChunkBookmarksDTO[];
   setShowConfirmModal: Setter<boolean>;

diff --git a/search/src/components/EditChunkPageForm.tsx b/search/src/components/EditChunkPageForm.tsx
@@ -1,6 +1,6 @@
 import { JSX, Show, createEffect, createSignal, useContext } from "solid-js";
 import {
-  ChunkMetadataWithFileData,
+  ChunkMetadata,
   isActixChunkUpdateError,
 } from "../../utils/apiTypes";
 import { FullScreenModal } from "./Atoms/FullScreenModal";
@@ -143,7 +143,7 @@ export const EditChunkPageForm = (props: SingleChunkPageProps) => {
       credentials: "include",
     }).then((response) => {
       if (response.ok) {
-        void response.json().then((data: ChunkMetadataWithFileData) => {
+        void response.json().then((data: ChunkMetadata) => {
           setEvidenceLink(data.link ?? "");
           setTagSet(data.tag_set ?? "");
           setMetadata(data.metadata);

diff --git a/search/src/components/GroupPage.tsx b/search/src/components/GroupPage.tsx
@@ -17,7 +17,7 @@ import {
   ChunkGroupSearchDTO,
   isScoreChunkDTO,
   isChunkGroupPageDTO,
-  ChunkMetadataWithFileData,
+  ChunkMetadata,
   ChunkBookmarksDTO,
 } from "../../utils/apiTypes";
 import { FullScreenModal } from "./Atoms/FullScreenModal";
@@ -55,7 +55,7 @@ export const GroupPage = (props: GroupPageProps) => {
   const [filters, setFilters] = createSignal<Filters | undefined>(undefined);
   const [searchLoading, setSearchLoading] = createSignal(false);
   const [chunkMetadatas, setChunkMetadatas] = createSignal<
-    ChunkMetadataWithFileData[]
+    ChunkMetadata[]
   >([]);
   const [searchMetadatasWithVotes, setSearchMetadatasWithVotes] = createSignal<
     ScoreChunkDTO[]
@@ -74,7 +74,7 @@ export const GroupPage = (props: GroupPageProps) => {
   const [loadingRecommendations, setLoadingRecommendations] =
     createSignal(false);
   const [recommendedChunks, setRecommendedChunks] = createSignal<
-    ChunkMetadataWithFileData[]
+    ChunkMetadata[]
   >([]);
   const [showConfirmDeleteModal, setShowConfirmDeleteModal] =
     createSignal(false);
@@ -328,7 +328,7 @@ export const GroupPage = (props: GroupPageProps) => {
 
   const fetchRecommendations = (
     ids: string[],
-    prev_recommendations: ChunkMetadataWithFileData[],
+    prev_recommendations: ChunkMetadata[],
   ) => {
     const currentDataset = $dataset?.();
     if (!currentDataset) return;
@@ -348,7 +348,7 @@ export const GroupPage = (props: GroupPageProps) => {
     }).then((response) => {
       if (response.ok) {
         void response.json().then((data) => {
-          const typed_data = data as ChunkMetadataWithFileData[];
+          const typed_data = data as ChunkMetadata[];
           const deduped_data = typed_data.filter((d) => {
             return !prev_recommendations.some((c) => c.id == d.id);
           });

diff --git a/search/src/components/ScoreChunk.tsx b/search/src/components/ScoreChunk.tsx
@@ -17,7 +17,7 @@ import {
 } from "solid-js";
 import {
   ChunkBookmarksDTO,
-  ChunkMetadataWithFileData,
+  ChunkMetadata,
   indirectHasOwnProperty,
   type ChunkGroupDTO,
 } from "../../utils/apiTypes";
@@ -63,7 +63,7 @@ export interface ScoreChunkProps {
   chunkGroups?: ChunkGroupDTO[];
   totalGroupPages?: number;
   group?: boolean;
-  chunk: ChunkMetadataWithFileData;
+  chunk: ChunkMetadata;
   score: number;
   setShowModal?: Setter<boolean>;
   setOnDelete?: Setter<() => void>;

diff --git a/search/src/components/ScoreChunkArray.tsx b/search/src/components/ScoreChunkArray.tsx
@@ -3,7 +3,7 @@ import { Show, createSignal, onMount, useContext } from "solid-js";
 import {
   indirectHasOwnProperty,
   type ChunkGroupDTO,
-  type ChunkMetadataWithFileData,
+  type ChunkMetadata,
 } from "../../utils/apiTypes";
 import type { ScoreChunkProps } from "./ScoreChunk";
 import { FiChevronLeft, FiChevronRight } from "solid-icons/fi";
@@ -14,7 +14,7 @@ export type ScoreChunkAraryProps = Omit<
   ScoreChunkProps,
   "chunk" | "counter" | "total" | "begin" | "end"
 > & {
-  chunks: ChunkMetadataWithFileData[];
+  chunks: ChunkMetadata[];
   setChunkGroups: Setter<ChunkGroupDTO[]>;
 };
 

diff --git a/search/src/components/SingleChunkPage.tsx b/search/src/components/SingleChunkPage.tsx
@@ -11,7 +11,7 @@ import {
   SingleChunkDTO,
   ChunkBookmarksDTO,
   isChunkGroupPageDTO,
-  ChunkMetadataWithFileData,
+  ChunkMetadata,
   ScoreChunkDTO,
 } from "../../utils/apiTypes";
 import ScoreChunk from "./ScoreChunk";
@@ -36,7 +36,7 @@ export const SingleChunkPage = (props: SingleChunkPageProps) => {
   const initialChunkMetadata = props.defaultResultChunk.metadata;
 
   const [chunkMetadata, setChunkMetadata] =
-    createSignal<ChunkMetadataWithFileData | null>(initialChunkMetadata);
+    createSignal<ChunkMetadata | null>(initialChunkMetadata);
   const [error, setError] = createSignal("");
   const [fetching, setFetching] = createSignal(true);
   const [chunkGroups, setChunkGroups] = createSignal<ChunkGroupDTO[]>([]);
@@ -52,7 +52,7 @@ export const SingleChunkPage = (props: SingleChunkPageProps) => {
   const [loadingRecommendations, setLoadingRecommendations] =
     createSignal(false);
   const [recommendedChunks, setRecommendedChunks] = createSignal<
-    ChunkMetadataWithFileData[]
+    ChunkMetadata[]
   >([]);
   const [openChat, setOpenChat] = createSignal(false);
   const [selectedIds, setSelectedIds] = createSignal<string[]>([]);
@@ -113,7 +113,7 @@ export const SingleChunkPage = (props: SingleChunkPageProps) => {
 
   const fetchRecommendations = (
     ids: string[],
-    prev_recommendations: ChunkMetadataWithFileData[],
+    prev_recommendations: ChunkMetadata[],
   ) => {
     setLoadingRecommendations(true);
     const currentDataset = $dataset?.();
@@ -133,7 +133,7 @@ export const SingleChunkPage = (props: SingleChunkPageProps) => {
     }).then((response) => {
       if (response.ok) {
         void response.json().then((data) => {
-          const typed_data = data as ChunkMetadataWithFileData[];
+          const typed_data = data as ChunkMetadata[];
           const deduped_data = typed_data.filter((d) => {
             return !prev_recommendations.some((c) => c.id == d.id);
           });
@@ -166,7 +166,7 @@ export const SingleChunkPage = (props: SingleChunkPageProps) => {
       },
     }).then((response) => {
       if (response.ok) {
-        void response.json().then((data: ChunkMetadataWithFileData) => {
+        void response.json().then((data: ChunkMetadata) => {
           setChunkMetadata(data);
           setScoreChunk([{ metadata: [data], score: 0 }]);
           setError("");

diff --git a/search/utils/apiTypes.ts b/search/utils/apiTypes.ts
@@ -1,7 +1,7 @@
 /* eslint-disable @typescript-eslint/no-explicit-any */
 import type { ComboboxSection } from "../src/components/Atoms/ComboboxChecklist";
 
-export interface ChunkMetadataWithFileData {
+export interface ChunkMetadata {
   id: string;
   content: string;
   chunk_html?: string;
@@ -12,9 +12,8 @@ export interface ChunkMetadataWithFileData {
   tag_set: string | null;
   tracking_id: string | null;
   time_stamp: string | null;
-  file_id: string | null;
-  file_name: string | null;
   metadata: Record<string, never> | null;
+  dataset_id: string;
   weight: number;
 }
 
@@ -26,27 +25,25 @@ export interface APIRequest {
   api_key: string;
 }
 
-export const isChunkMetadata = (
-  chunk: unknown,
-): chunk is ChunkMetadataWithFileData => {
+export const isChunkMetadata = (chunk: unknown): chunk is ChunkMetadata => {
   if (typeof chunk !== "object" || chunk === null) return false;
 
   return (
     indirectHasOwnProperty(chunk, "id") &&
-    typeof (chunk as ChunkMetadataWithFileData).id === "string" &&
+    typeof (chunk as ChunkMetadata).id === "string" &&
     indirectHasOwnProperty(chunk, "content") &&
-    typeof (chunk as ChunkMetadataWithFileData).content === "string" &&
+    typeof (chunk as ChunkMetadata).content === "string" &&
     indirectHasOwnProperty(chunk, "qdrant_point_id") &&
-    typeof (chunk as ChunkMetadataWithFileData).qdrant_point_id === "string" &&
+    typeof (chunk as ChunkMetadata).qdrant_point_id === "string" &&
     indirectHasOwnProperty(chunk, "created_at") &&
-    typeof (chunk as ChunkMetadataWithFileData).created_at === "string" &&
+    typeof (chunk as ChunkMetadata).created_at === "string" &&
     indirectHasOwnProperty(chunk, "updated_at") &&
-    typeof (chunk as ChunkMetadataWithFileData).updated_at === "string" &&
+    typeof (chunk as ChunkMetadata).updated_at === "string" &&
     indirectHasOwnProperty(chunk, "tag_set") &&
-    (typeof (chunk as ChunkMetadataWithFileData).tag_set === "string" ||
-      (chunk as ChunkMetadataWithFileData).tag_set === null) &&
-    (typeof (chunk as ChunkMetadataWithFileData).metadata === "object" ||
-      (chunk as ChunkMetadataWithFileData).metadata === null)
+    (typeof (chunk as ChunkMetadata).tag_set === "string" ||
+      (chunk as ChunkMetadata).tag_set === null) &&
+    (typeof (chunk as ChunkMetadata).metadata === "object" ||
+      (chunk as ChunkMetadata).metadata === null)
   );
 };
 
@@ -73,7 +70,7 @@ export interface ChunksWithTotalPagesDTO {
 }
 
 export interface ScoreChunkDTO {
-  metadata: [ChunkMetadataWithFileData];
+  metadata: [ChunkMetadata];
   score: number;
 }
 
@@ -204,7 +201,7 @@ export const isUserDTO = (user: unknown): user is UserDTO => {
 
 export type UserDTOWithVotesAndChunks = UserDTO & {
   created_at: string;
-  chunks: ChunkMetadataWithFileData[];
+  chunks: ChunkMetadata[];
   total_chunks_created: number;
 };
 
@@ -289,7 +286,7 @@ export const isChunkGroupDTO = (group: unknown): group is ChunkGroupDTO => {
 };
 
 export interface ChunkGroupBookmarkDTO {
-  chunks: ChunkMetadataWithFileData[];
+  chunks: ChunkMetadata[];
   group: ChunkGroupDTO;
   total_pages: number;
 }
@@ -317,17 +314,17 @@ export const isChunkGroupSearchDTO = (
 
 export interface CreateChunkDTO {
   message?: string;
-  chunk_metadata: ChunkMetadataWithFileData;
+  chunk_metadata: ChunkMetadata;
   duplicate: boolean;
 }
 
 export interface SingleChunkDTO {
-  metadata: ChunkMetadataWithFileData | null;
+  metadata: ChunkMetadata | null;
   status: number;
 }
 
 export interface ChunkGroupBookmarksDTO {
-  bookmarks: ChunkMetadataWithFileData[];
+  bookmarks: ChunkMetadata[];
   group: ChunkGroupDTO;
 }
 export interface ChunkGroupBookmarksWithStatusDTO {
@@ -587,7 +584,7 @@ export function isChunkFilePagesDTO(file: unknown): file is ChunkFilePagesDTO {
 }
 
 export interface BookmarkData {
-  chunks: ChunkMetadataWithFileData[];
+  chunks: ChunkMetadata[];
   group: ChunkGroupDTO;
   total_pages: number;
 }