update types (#28)

Author: lucasjacks0n

package.json

@@ -1,6 +1,6 @@
 {
   "name": "getindexify",
-  "version": "0.0.35",
+  "version": "0.0.36",
   "description": "This is the TypeScript client for interacting with the Indexify service.",
   "main": "./dist/index.js",
   "module": "./dist/index.mjs",

src/types.ts

@@ -32,7 +32,8 @@ export interface IIndex {
 
 export interface IBaseContentMetadata {
   id: string;
-  parent_id?: string;
+  parent_id: string;
+  root_content_id: string;
   namespace: string;
   name: string;
   mime_type: string;
@@ -41,7 +42,9 @@ export interface IBaseContentMetadata {
   created_at: number;
   source: string;
   size: number;
+  hash: string;
 }
+
 export interface IContentMetadata extends IBaseContentMetadata {
   content_url: string;
 }
@@ -62,18 +65,33 @@ export interface IExtractionPolicy {
   content_source?: string;
 }
 
+export interface ITaskContentMetadata {
+  id: string;
+  parent_id: string;
+  root_content_id: string;
+  namespace: string;
+  name: string;
+  content_type: string;
+  labels: Record<string, string>;
+  storage_url: string;
+  created_at: number;
+  source: string;
+  size_bytes: number;
+  tombstoned: boolean;
+  hash: string;
+  extraction_policy_ids: Record<string, number>;
+}
+
 export interface ITask {
-  content_metadata: IContentMetadata;
+  id: string;
   extractor: string;
-  extraction_policy: string;
   extraction_policy_id: string;
-  id: string;
-  input_params: Record<string, string>;
+  output_index_table_mapping: Record<string, string>;
+  namespace: string;
+  content_metadata: ITaskContentMetadata;
+  input_params: { [key: string]: any };
   outcome: string;
-  output_index_table_mapping: {
-    embedding: string;
-  };
-  repository: string;
+  index_tables: string[];
 }
 
 export interface IDocument {
@@ -103,15 +121,16 @@ export interface IContentResp {
 }
 
 export interface IExtractResponse {
-  features: IFeature[]
-  content: IContentResp[]
+  features: IFeature[];
+  content: IContentResp[];
 }
-
 export interface ISearchIndexResponse {
   content_id: string;
   text: string;
   confidence_score: number;
   labels: Record<string, string>;
+  content_metadata: IContentMetadata;
+  root_content_metadata?: IContentMetadata;
 }
 
 export interface IAddExtractorPolicyResponse {
@@ -123,4 +142,3 @@ export interface IMtlsConfig {
   keyPath: string;
   caPath?: string; // Optional, only if using a custom CA
 }
-

tests/client.test.ts

@@ -1,32 +1,53 @@
 import { IndexifyClient } from "../src";
 import { IExtractionPolicy } from "../src/types";
 import { isAxiosError } from "axios";
+
 const fs = require("fs");
 
 jest.setTimeout(30000);
 
+function generateNanoId(length: number = 21): string {
+  const characters =
+    "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789";
+  let result = "";
+  for (let i = 0; i < length; i++) {
+    const randomIndex = Math.floor(Math.random() * characters.length);
+    result += characters[randomIndex];
+  }
+  return result;
+}
+
 test("Create Client", async () => {
   const client = await IndexifyClient.createClient();
   expect(client.namespace).toBe("default");
 });
 
 test("Create Namespace", async () => {
+  const nanoid = generateNanoId(8);
+  const namespaceName = `testnamespace.${nanoid}`;
   const client = await IndexifyClient.createNamespace({
-    namespace: "testnamespace",
+    namespace: namespaceName,
     extraction_policies: [
       {
+        id: nanoid,
         extractor: "tensorlake/minilm-l6",
-        name: "testpolicy",
+        name: `testpolicy`,
       },
     ],
+  }).catch((e) => {
+    if (isAxiosError(e)) {
+      console.log(e.response?.data);
+    }
+    console.log("error creating namespace");
+    throw e;
   });
 
-  expect(client.namespace).toBe("testnamespace");
+  expect(client.namespace).toBe(namespaceName);
   // test get namespaces
   const namespaces = await IndexifyClient.namespaces();
-  expect(
-    namespaces.filter((item) => item.name === "testnamespace").length
-  ).toBe(1);
+  expect(namespaces.filter((item) => item.name === namespaceName).length).toBe(
+    1
+  );
 });
 
 test("Get Extractors", async () => {
@@ -36,8 +57,9 @@ test("Get Extractors", async () => {
 });
 
 test("Add Documents", async () => {
+  const nanoid = generateNanoId(8);
   const client = await IndexifyClient.createNamespace({
-    namespace: "test.adddocuments",
+    namespace: `test.adddocuments.${nanoid}`,
   });
 
   // add single documents
@@ -71,14 +93,16 @@ test("Add Documents", async () => {
 });
 
 test("Search", async () => {
+  const nanoid = generateNanoId(8);
+
   const policy: IExtractionPolicy = {
     extractor: "tensorlake/minilm-l6",
-    name: "minilml6",
+    name: `minilml6.${nanoid}`,
     labels_eq: "source:test",
   };
 
   const client = await IndexifyClient.createNamespace({
-    namespace: "testsearch",
+    namespace: `testsearch.${nanoid}`,
   });
 
   const resp = await client.addExtractionPolicy(policy);
@@ -91,9 +115,10 @@ test("Search", async () => {
     { text: "This is a test2", labels: { source: "test" } },
   ]);
 
-  await new Promise((r) => setTimeout(r, 15000));
+  await new Promise((r) => setTimeout(r, 10000));
 
   const searchResult = await client.searchIndex(indexName, "test", 3);
+  console.log(searchResult);
   expect(searchResult.length).toBe(2);
 });
 
@@ -114,8 +139,9 @@ test("Upload file", async () => {
 });
 
 test("Get content", async () => {
+  const nanoid = generateNanoId(8);
   const client = await IndexifyClient.createNamespace({
-    namespace: "testgetcontent",
+    namespace: `testgetcontent.${nanoid}`,
   });
   await client.addDocuments([
     { text: "This is a test1", labels: { source: "test" } },
@@ -136,8 +162,9 @@ test("Get content", async () => {
 });
 
 test("Download content", async () => {
+  const nanoid = generateNanoId(8);
   const client = await IndexifyClient.createNamespace({
-    namespace: "testgetcontent",
+    namespace: `testgetcontent.${nanoid}`,
   });
   await client.addDocuments([
     { text: "This is a download", labels: { source: "testdownload" } },
@@ -175,7 +202,7 @@ test("Ingest remote url", async () => {
   );
 });
 
-test.only("Test Extract Method", async () => {
+test("Test Extract Method", async () => {
   // Test minilm feature extract
   const client = await IndexifyClient.createClient();
   const res = await client.extract({