fix: merge errors

jina-ai · Sep 21, 2021 · 4121adb · 4121adb
1 parent c7569cf
commit 4121adb
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 13 deletions.
diff --git a/packages/jinajs/src/jinaClient.ts b/packages/jinajs/src/jinaClient.ts
@@ -1,5 +1,4 @@
 import axios, { AxiosInstance } from "axios";
-import { AnyObject } from "index";
 import { serializeRequest, serializeResponse } from "./serializer";
 import MockedClient from './MockedClient'
 import {
@@ -62,11 +61,12 @@ export class JinaClient<IRequest = AnyObject ,IResponse = AnyObject> {
     documents: RawDocumentData[],
     parameters: AnyObject
   ): Promise<{ results: SimpleResults[]; queries: SimpleQueries }> {
-    const requestBody = await this.serializeRequest(documents, this.jinaVersion,parameters);
+    console.log(parameters)
+    const requestBody = await this.serializeRequest(documents);
     console.log("request body:", requestBody);
     const response = await this.client.post("search", requestBody);
     console.log("response:", response);
-    return this.serializeResponse(response.data, this.jinaVersion);
+    return this.serializeResponse(response.data);
   }
 
 }
diff --git a/packages/jinajs/src/serializer.ts b/packages/jinajs/src/serializer.ts
@@ -44,7 +44,7 @@ export function serializeResponse(
     });
     const { matches } = doc;
     results.push(
-        matches.map(({ scores, text, uri, mimeType }: any) => {
+        matches.map(({ scores, text, uri, mimeType, tags }: any) => {
           const score = scores.values
               ? scores.values?.value
               : scores.score?.value;

diff --git a/packages/jinajs/src/utils.ts b/packages/jinajs/src/utils.ts
@@ -10,12 +10,12 @@ export const fileToBase64 = (file: File): Promise<string> =>
 
 export function urlToBase64(url: string) {
   return new Promise(function (resolve, reject) {
-    var xhr = new XMLHttpRequest();
+    const xhr = new XMLHttpRequest();
     xhr.responseType = "arraybuffer";
     xhr.open("GET", `${url}`);
 
     xhr.onload = function () {
-      var base64, binary, bytes, mediaType;
+      let base64, binary, bytes, mediaType;
 
       bytes = new Uint8Array(xhr.response);
       //NOTE String.fromCharCode.apply(String, ...
@@ -42,13 +42,6 @@ export function urlToBase64(url: string) {
   });
 }
 
-    new Promise((resolve, reject) => {
-        const reader = new FileReader();
-        reader.readAsDataURL(file);
-        reader.onload = () => resolve(reader.result as string);
-        reader.onerror = (error) => reject(error);
-    });
-
 export const schemaToMock = (schema: OpenAPIV3.SchemaObject) => {
     let mockedResponse = {
         ...schema?.properties