@mediaviz/sdk 1.0.60 → 1.0.62

package/dist/sdk.cjs

@@ -481,7 +481,7 @@ class Company {
   }
 }
 
-function stripUndef$5(o) { const r = {}; for (const k in o) if (o[k] !== undefined) r[k] = o[k]; return r; }
+function stripUndef$6(o) { const r = {}; for (const k in o) if (o[k] !== undefined) r[k] = o[k]; return r; }
 
 class CuratedAlbums {
   constructor(ctx) { this._ctx = ctx; }
@@ -489,7 +489,7 @@ class CuratedAlbums {
   async createCuratedAlbum(projectTableName, name, description = undefined, confidenceValue = undefined) {
     this._ctx.requireTokens();
     const path = `/api/v1/curated_album/project/${encodeURIComponent(projectTableName)}`;
-    const body = stripUndef$5({
+    const body = stripUndef$6({
       name: name,
       description: description,
       confidence_value: confidenceValue,
@@ -543,7 +543,7 @@ class CuratedAlbums {
   async updateCuratedAlbum(albumId, { name, description, confidenceValue } = {}) {
     this._ctx.requireTokens();
     const path = `/api/v1/curated_album/${encodeURIComponent(albumId)}`;
-    const body = stripUndef$5({
+    const body = stripUndef$6({
       name: name,
       description: description,
       confidence_value: confidenceValue,
@@ -567,7 +567,7 @@ class CuratedAlbums {
   }
 }
 
-function stripUndef$4(o) { const r = {}; for (const k in o) if (o[k] !== undefined) r[k] = o[k]; return r; }
+function stripUndef$5(o) { const r = {}; for (const k in o) if (o[k] !== undefined) r[k] = o[k]; return r; }
 
 class CustomAlbums {
   constructor(ctx) { this._ctx = ctx; }
@@ -615,7 +615,7 @@ class CustomAlbums {
   async createProjectCustomAlbum(projectTableName, { name, description, photoIdInclusionList, photoIdRemovalList } = {}) {
     this._ctx.requireTokens();
     const path = `/api/v1/custom_album/project/${encodeURIComponent(projectTableName)}`;
-    const body = stripUndef$4({
+    const body = stripUndef$5({
       name: name,
       description: description,
       photo_id_inclusion_list: photoIdInclusionList,
@@ -628,7 +628,7 @@ class CustomAlbums {
   async updateCustomAlbum(albumId, { name, description, photoIdInclusionList, photoIdRemovalList } = {}) {
     this._ctx.requireTokens();
     const path = `/api/v1/custom_album/${encodeURIComponent(albumId)}`;
-    const body = stripUndef$4({
+    const body = stripUndef$5({
       name: name,
       description: description,
       photo_id_inclusion_list: photoIdInclusionList,
@@ -728,7 +728,7 @@ async function handleResponse(response) {
   }
 }
 
-function stripUndef$3(o) { const r = {}; for (const k in o) if (o[k] !== undefined) r[k] = o[k]; return r; }
+function stripUndef$4(o) { const r = {}; for (const k in o) if (o[k] !== undefined) r[k] = o[k]; return r; }
 
 class EmailTokens {
   constructor(ctx) { this._ctx = ctx; }
@@ -759,7 +759,7 @@ class EmailTokens {
   }
 
   async validateToken(token) {
-    const body = stripUndef$3({
+    const body = stripUndef$4({
       token: token,
     });
     const resp = await fetch(this._ctx.baseUrl + `/api/v1/validate-token`, {
@@ -771,7 +771,7 @@ class EmailTokens {
   }
 
   async resetPassword(token, newPassword) {
-    const body = stripUndef$3({
+    const body = stripUndef$4({
       token: token,
       new_password: newPassword,
     });
@@ -810,7 +810,7 @@ class Health {
   }
 }
 
-function stripUndef$2(o) { const r = {}; for (const k in o) if (o[k] !== undefined) r[k] = o[k]; return r; }
+function stripUndef$3(o) { const r = {}; for (const k in o) if (o[k] !== undefined) r[k] = o[k]; return r; }
 
 class Keywords {
   constructor(ctx) { this._ctx = ctx; }
@@ -818,7 +818,7 @@ class Keywords {
   async createKeywordFilteringList(name, projectList = undefined) {
     this._ctx.requireTokens();
     const path = `/api/v1/keyword/`;
-    const body = stripUndef$2({
+    const body = stripUndef$3({
       name: name,
       project_list: projectList,
     });
@@ -833,6 +833,13 @@ class Keywords {
     return data;
   }
 
+  async getCompanyKeywordLists(companyId) {
+    this._ctx.requireTokens();
+    const path = `/api/v1/keyword/company/${encodeURIComponent(companyId)}`;
+    const { data } = await this._ctx.client.request(path, 'GET', this._ctx.accessToken, this._ctx.refreshToken);
+    return data;
+  }
+
   async getKeywordFilteringListAndProjectsById(keywordListId) {
     this._ctx.requireTokens();
     const path = `/api/v1/keyword/${encodeURIComponent(keywordListId)}`;
@@ -864,7 +871,7 @@ class Keywords {
   async updateKeywordFilteringListLabels(keywordListId, listKeywordsToInclude, listKeywordsToExclude) {
     this._ctx.requireTokens();
     const path = `/api/v1/keyword/${encodeURIComponent(keywordListId)}`;
-    const body = stripUndef$2({
+    const body = stripUndef$3({
       list_keywords_to_include: listKeywordsToInclude,
       list_keywords_to_exclude: listKeywordsToExclude,
     });
@@ -875,7 +882,7 @@ class Keywords {
   async updateKeywordFilteringListDetails(keywordListId, { name, projectList } = {}) {
     this._ctx.requireTokens();
     const path = `/api/v1/keyword/details/${encodeURIComponent(keywordListId)}`;
-    const body = stripUndef$2({
+    const body = stripUndef$3({
       name: name,
       project_list: projectList,
     });
@@ -1093,7 +1100,7 @@ class Person {
   }
 }
 
-function stripUndef$1(o) { const r = {}; for (const k in o) if (o[k] !== undefined) r[k] = o[k]; return r; }
+function stripUndef$2(o) { const r = {}; for (const k in o) if (o[k] !== undefined) r[k] = o[k]; return r; }
 
 class Projects {
   constructor(ctx) { this._ctx = ctx; }
@@ -1106,7 +1113,7 @@ class Projects {
     if (models !== undefined) (Array.isArray(models) ? models : [models]).forEach(v => query.append('models', v));
     const qs = query.toString();
     if (qs) path += '?' + qs;
-    const body = stripUndef$1({
+    const body = stripUndef$2({
       name: name,
       private: private_,
       type: type,
@@ -1176,7 +1183,7 @@ class Projects {
   async updateProject(projectId, { private: private_, type, description, directory, name, thumbnail } = {}) {
     this._ctx.requireTokens();
     const path = `/api/v1/projects/${encodeURIComponent(projectId)}`;
-    const body = stripUndef$1({
+    const body = stripUndef$2({
       private: private_,
       type: type,
       description: description,
@@ -1255,7 +1262,7 @@ class Projects {
   async addProjectEvent(projectTableName, event, detail = undefined) {
     this._ctx.requireTokens();
     const path = `/api/v1/projects/${encodeURIComponent(projectTableName)}/event`;
-    const body = stripUndef$1({
+    const body = stripUndef$2({
       event: event,
       detail: detail,
     });
@@ -1274,18 +1281,18 @@ class Projects {
 class Photoupload {
   constructor(ctx) { this._ctx = ctx; this._caches = {}; }
 
-  async uploadPhotoToMediaviz({ fileContent, mimetype, filePath }, { companyId, userId, projectTableName, clientSideId, title, blur, colors, faceRecognition, imageDescribe, imageClassification, imageComparison, size, sourceResolutionX, sourceResolutionY, dateTaken, latitude, longitude, bucketName, photoIndex } = {}) {
+  async uploadPhotoToMediaviz(companyId, userId, projectTableName, title, { fileContent, mimetype, filePath }, { clientSideId, blur, colors, faceRecognition, imageDescribe, imageClassification, imageComparison, size, sourceResolutionX, sourceResolutionY, dateTaken, latitude, longitude, ocr } = {}) {
     this._ctx.requireTokens();
     const baseUrl = this._ctx.requireHost('photoUpload');
     const headers = {
       'Content-Type': 'application/json',
       'Authorization': this._ctx.accessToken,
+      'x-company-id': companyId,
+      'x-user-id': userId,
+      'x-project-table-name': projectTableName,
+      'x-title': title,
     };
-    if (companyId !== undefined) headers['x-company-id'] = companyId;
-    if (userId !== undefined) headers['x-user-id'] = userId;
-    if (projectTableName !== undefined) headers['x-project-table-name'] = projectTableName;
     if (clientSideId !== undefined) headers['x-client-side-id'] = clientSideId;
-    if (title !== undefined) headers['x-title'] = title;
     if (blur !== undefined) headers['x-blur'] = blur;
     if (colors !== undefined) headers['x-colors'] = colors;
     if (faceRecognition !== undefined) headers['x-face-recognition'] = faceRecognition;
@@ -1298,8 +1305,7 @@ class Photoupload {
     if (dateTaken !== undefined) headers['x-date-taken'] = dateTaken;
     if (latitude !== undefined) headers['x-latitude'] = latitude;
     if (longitude !== undefined) headers['x-longitude'] = longitude;
-    if (bucketName !== undefined) headers['x-bucket-name'] = bucketName;
-    if (photoIndex !== undefined) headers['x-photo-index'] = photoIndex;
+    if (ocr !== undefined) headers['x-ocr'] = ocr;
     const resp = await fetch(baseUrl + `/photo_upload`, {
       method: 'POST',
       headers,
@@ -1319,7 +1325,7 @@ class Photoupload {
       this._caches['_get_template'].set(_cacheKey_get_template, template);
     }
 
-    const upload_result = await this.uploadPhotoToMediaviz({ fileContent: photo.fileContent, mimetype: photo.mimetype, filePath: photo.filePath }, { companyId: companyId, userId: userId, projectTableName: projectTableName, clientSideId: photo.clientSideId, title: photo.title, blur: photo.blur, colors: photo.colors, faceRecognition: photo.faceRecognition, imageDescribe: photo.imageDescribe, imageClassification: photo.imageClassification, imageComparison: photo.imageComparison, size: photo.size, sourceResolutionX: photo.sourceResolutionX, sourceResolutionY: photo.sourceResolutionY, dateTaken: photo.dateTaken, latitude: photo.latitude, longitude: photo.longitude, bucketName: template.bucket_name, photoIndex: photoIndex });
+    const upload_result = await this.uploadPhotoToMediaviz(companyId, userId, projectTableName, photo.title, { fileContent: photo.fileContent, mimetype: photo.mimetype, filePath: photo.filePath }, { clientSideId: photo.clientSideId, blur: photo.blur, colors: photo.colors, faceRecognition: photo.faceRecognition, imageDescribe: photo.imageDescribe, imageClassification: photo.imageClassification, imageComparison: photo.imageComparison, size: photo.size, sourceResolutionX: photo.sourceResolutionX, sourceResolutionY: photo.sourceResolutionY, dateTaken: photo.dateTaken, latitude: photo.latitude, longitude: photo.longitude });
 
     return upload_result;
   }
@@ -1328,13 +1334,6 @@ class Photoupload {
 class Photos {
   constructor(ctx) { this._ctx = ctx; }
 
-  async addPhotoToProject({ photo, tableName, sourceResolutionX, sourceResolutionY, dateTaken, latitude, longitude, filePath, title, clientSideId }) {
-    this._ctx.requireTokens();
-    const path = `/api/v1/photos/`;
-    const { data } = await this._ctx.client.request(path, 'POST', this._ctx.accessToken, this._ctx.refreshToken, { photo, table_name: tableName, source_resolution_x: sourceResolutionX, source_resolution_y: sourceResolutionY, date_taken: dateTaken, latitude, longitude, file_path: filePath, title, client_side_id: clientSideId });
-    return data;
-  }
-
   async getPhotoFromProject(tableName, photoId, { keywordListId } = {}) {
     this._ctx.requireTokens();
     let path = `/api/v1/photos/${encodeURIComponent(tableName)}/${encodeURIComponent(photoId)}`;
@@ -1432,6 +1431,8 @@ class Photos {
   }
 }
 
+function stripUndef$1(o) { const r = {}; for (const k in o) if (o[k] !== undefined) r[k] = o[k]; return r; }
+
 class Search {
   constructor(ctx) { this._ctx = ctx; }
 
@@ -1460,6 +1461,60 @@ class Search {
     return data;
   }
 
+  async searchProjectPhotosText(projectTableName, searchText, size = undefined) {
+    this._ctx.requireTokens();
+    const path = `/api/v1/search/text/${encodeURIComponent(projectTableName)}/`;
+    const body = stripUndef$1({
+      search_text: searchText,
+      size: size,
+    });
+    const { data } = await this._ctx.client.request(path, 'POST', this._ctx.accessToken, this._ctx.refreshToken, body);
+    return data;
+  }
+
+  async searchProjectPhotosNaturalLanguage(projectTableName, searchText, size = undefined) {
+    this._ctx.requireTokens();
+    const path = `/api/v1/search/nl/${encodeURIComponent(projectTableName)}/`;
+    const body = stripUndef$1({
+      search_text: searchText,
+      size: size,
+    });
+    const { data } = await this._ctx.client.request(path, 'POST', this._ctx.accessToken, this._ctx.refreshToken, body);
+    return data;
+  }
+
+  async searchProjectPhotosNaturalLanguageHybrid(projectTableName, searchText, size = undefined, { blend, minCosine } = {}) {
+    this._ctx.requireTokens();
+    let path = `/api/v1/search/nl_hybrid/${encodeURIComponent(projectTableName)}/`;
+    const query = new URLSearchParams();
+    if (blend !== undefined) (Array.isArray(blend) ? blend : [blend]).forEach(v => query.append('blend', v));
+    if (minCosine !== undefined) (Array.isArray(minCosine) ? minCosine : [minCosine]).forEach(v => query.append('min_cosine', v));
+    const qs = query.toString();
+    if (qs) path += '?' + qs;
+    const body = stripUndef$1({
+      search_text: searchText,
+      size: size,
+    });
+    const { data } = await this._ctx.client.request(path, 'POST', this._ctx.accessToken, this._ctx.refreshToken, body);
+    return data;
+  }
+
+  async searchProjectPhotosNaturalLanguageAuto(projectTableName, searchText, size = undefined, { blend, minCosine } = {}) {
+    this._ctx.requireTokens();
+    let path = `/api/v1/search/auto/${encodeURIComponent(projectTableName)}/`;
+    const query = new URLSearchParams();
+    if (blend !== undefined) (Array.isArray(blend) ? blend : [blend]).forEach(v => query.append('blend', v));
+    if (minCosine !== undefined) (Array.isArray(minCosine) ? minCosine : [minCosine]).forEach(v => query.append('min_cosine', v));
+    const qs = query.toString();
+    if (qs) path += '?' + qs;
+    const body = stripUndef$1({
+      search_text: searchText,
+      size: size,
+    });
+    const { data } = await this._ctx.client.request(path, 'POST', this._ctx.accessToken, this._ctx.refreshToken, body);
+    return data;
+  }
+
   async getProjectSavedSearches(projectTableName) {
     this._ctx.requireTokens();
     const path = `/api/v1/search/saved/${encodeURIComponent(projectTableName)}/`;

package/dist/sdk.esm.js

@@ -479,7 +479,7 @@ class Company {
   }
 }
 
-function stripUndef$5(o) { const r = {}; for (const k in o) if (o[k] !== undefined) r[k] = o[k]; return r; }
+function stripUndef$6(o) { const r = {}; for (const k in o) if (o[k] !== undefined) r[k] = o[k]; return r; }
 
 class CuratedAlbums {
   constructor(ctx) { this._ctx = ctx; }
@@ -487,7 +487,7 @@ class CuratedAlbums {
   async createCuratedAlbum(projectTableName, name, description = undefined, confidenceValue = undefined) {
     this._ctx.requireTokens();
     const path = `/api/v1/curated_album/project/${encodeURIComponent(projectTableName)}`;
-    const body = stripUndef$5({
+    const body = stripUndef$6({
       name: name,
       description: description,
       confidence_value: confidenceValue,
@@ -541,7 +541,7 @@ class CuratedAlbums {
   async updateCuratedAlbum(albumId, { name, description, confidenceValue } = {}) {
     this._ctx.requireTokens();
     const path = `/api/v1/curated_album/${encodeURIComponent(albumId)}`;
-    const body = stripUndef$5({
+    const body = stripUndef$6({
       name: name,
       description: description,
       confidence_value: confidenceValue,
@@ -565,7 +565,7 @@ class CuratedAlbums {
   }
 }
 
-function stripUndef$4(o) { const r = {}; for (const k in o) if (o[k] !== undefined) r[k] = o[k]; return r; }
+function stripUndef$5(o) { const r = {}; for (const k in o) if (o[k] !== undefined) r[k] = o[k]; return r; }
 
 class CustomAlbums {
   constructor(ctx) { this._ctx = ctx; }
@@ -613,7 +613,7 @@ class CustomAlbums {
   async createProjectCustomAlbum(projectTableName, { name, description, photoIdInclusionList, photoIdRemovalList } = {}) {
     this._ctx.requireTokens();
     const path = `/api/v1/custom_album/project/${encodeURIComponent(projectTableName)}`;
-    const body = stripUndef$4({
+    const body = stripUndef$5({
       name: name,
       description: description,
       photo_id_inclusion_list: photoIdInclusionList,
@@ -626,7 +626,7 @@ class CustomAlbums {
   async updateCustomAlbum(albumId, { name, description, photoIdInclusionList, photoIdRemovalList } = {}) {
     this._ctx.requireTokens();
     const path = `/api/v1/custom_album/${encodeURIComponent(albumId)}`;
-    const body = stripUndef$4({
+    const body = stripUndef$5({
       name: name,
       description: description,
       photo_id_inclusion_list: photoIdInclusionList,
@@ -726,7 +726,7 @@ async function handleResponse(response) {
   }
 }
 
-function stripUndef$3(o) { const r = {}; for (const k in o) if (o[k] !== undefined) r[k] = o[k]; return r; }
+function stripUndef$4(o) { const r = {}; for (const k in o) if (o[k] !== undefined) r[k] = o[k]; return r; }
 
 class EmailTokens {
   constructor(ctx) { this._ctx = ctx; }
@@ -757,7 +757,7 @@ class EmailTokens {
   }
 
   async validateToken(token) {
-    const body = stripUndef$3({
+    const body = stripUndef$4({
       token: token,
     });
     const resp = await fetch(this._ctx.baseUrl + `/api/v1/validate-token`, {
@@ -769,7 +769,7 @@ class EmailTokens {
   }
 
   async resetPassword(token, newPassword) {
-    const body = stripUndef$3({
+    const body = stripUndef$4({
       token: token,
       new_password: newPassword,
     });
@@ -808,7 +808,7 @@ class Health {
   }
 }
 
-function stripUndef$2(o) { const r = {}; for (const k in o) if (o[k] !== undefined) r[k] = o[k]; return r; }
+function stripUndef$3(o) { const r = {}; for (const k in o) if (o[k] !== undefined) r[k] = o[k]; return r; }
 
 class Keywords {
   constructor(ctx) { this._ctx = ctx; }
@@ -816,7 +816,7 @@ class Keywords {
   async createKeywordFilteringList(name, projectList = undefined) {
     this._ctx.requireTokens();
     const path = `/api/v1/keyword/`;
-    const body = stripUndef$2({
+    const body = stripUndef$3({
       name: name,
       project_list: projectList,
     });
@@ -831,6 +831,13 @@ class Keywords {
     return data;
   }
 
+  async getCompanyKeywordLists(companyId) {
+    this._ctx.requireTokens();
+    const path = `/api/v1/keyword/company/${encodeURIComponent(companyId)}`;
+    const { data } = await this._ctx.client.request(path, 'GET', this._ctx.accessToken, this._ctx.refreshToken);
+    return data;
+  }
+
   async getKeywordFilteringListAndProjectsById(keywordListId) {
     this._ctx.requireTokens();
     const path = `/api/v1/keyword/${encodeURIComponent(keywordListId)}`;
@@ -862,7 +869,7 @@ class Keywords {
   async updateKeywordFilteringListLabels(keywordListId, listKeywordsToInclude, listKeywordsToExclude) {
     this._ctx.requireTokens();
     const path = `/api/v1/keyword/${encodeURIComponent(keywordListId)}`;
-    const body = stripUndef$2({
+    const body = stripUndef$3({
       list_keywords_to_include: listKeywordsToInclude,
       list_keywords_to_exclude: listKeywordsToExclude,
     });
@@ -873,7 +880,7 @@ class Keywords {
   async updateKeywordFilteringListDetails(keywordListId, { name, projectList } = {}) {
     this._ctx.requireTokens();
     const path = `/api/v1/keyword/details/${encodeURIComponent(keywordListId)}`;
-    const body = stripUndef$2({
+    const body = stripUndef$3({
       name: name,
       project_list: projectList,
     });
@@ -1091,7 +1098,7 @@ class Person {
   }
 }
 
-function stripUndef$1(o) { const r = {}; for (const k in o) if (o[k] !== undefined) r[k] = o[k]; return r; }
+function stripUndef$2(o) { const r = {}; for (const k in o) if (o[k] !== undefined) r[k] = o[k]; return r; }
 
 class Projects {
   constructor(ctx) { this._ctx = ctx; }
@@ -1104,7 +1111,7 @@ class Projects {
     if (models !== undefined) (Array.isArray(models) ? models : [models]).forEach(v => query.append('models', v));
     const qs = query.toString();
     if (qs) path += '?' + qs;
-    const body = stripUndef$1({
+    const body = stripUndef$2({
       name: name,
       private: private_,
       type: type,
@@ -1174,7 +1181,7 @@ class Projects {
   async updateProject(projectId, { private: private_, type, description, directory, name, thumbnail } = {}) {
     this._ctx.requireTokens();
     const path = `/api/v1/projects/${encodeURIComponent(projectId)}`;
-    const body = stripUndef$1({
+    const body = stripUndef$2({
       private: private_,
       type: type,
       description: description,
@@ -1253,7 +1260,7 @@ class Projects {
   async addProjectEvent(projectTableName, event, detail = undefined) {
     this._ctx.requireTokens();
     const path = `/api/v1/projects/${encodeURIComponent(projectTableName)}/event`;
-    const body = stripUndef$1({
+    const body = stripUndef$2({
       event: event,
       detail: detail,
     });
@@ -1272,18 +1279,18 @@ class Projects {
 class Photoupload {
   constructor(ctx) { this._ctx = ctx; this._caches = {}; }
 
-  async uploadPhotoToMediaviz({ fileContent, mimetype, filePath }, { companyId, userId, projectTableName, clientSideId, title, blur, colors, faceRecognition, imageDescribe, imageClassification, imageComparison, size, sourceResolutionX, sourceResolutionY, dateTaken, latitude, longitude, bucketName, photoIndex } = {}) {
+  async uploadPhotoToMediaviz(companyId, userId, projectTableName, title, { fileContent, mimetype, filePath }, { clientSideId, blur, colors, faceRecognition, imageDescribe, imageClassification, imageComparison, size, sourceResolutionX, sourceResolutionY, dateTaken, latitude, longitude, ocr } = {}) {
     this._ctx.requireTokens();
     const baseUrl = this._ctx.requireHost('photoUpload');
     const headers = {
       'Content-Type': 'application/json',
       'Authorization': this._ctx.accessToken,
+      'x-company-id': companyId,
+      'x-user-id': userId,
+      'x-project-table-name': projectTableName,
+      'x-title': title,
     };
-    if (companyId !== undefined) headers['x-company-id'] = companyId;
-    if (userId !== undefined) headers['x-user-id'] = userId;
-    if (projectTableName !== undefined) headers['x-project-table-name'] = projectTableName;
     if (clientSideId !== undefined) headers['x-client-side-id'] = clientSideId;
-    if (title !== undefined) headers['x-title'] = title;
     if (blur !== undefined) headers['x-blur'] = blur;
     if (colors !== undefined) headers['x-colors'] = colors;
     if (faceRecognition !== undefined) headers['x-face-recognition'] = faceRecognition;
@@ -1296,8 +1303,7 @@ class Photoupload {
     if (dateTaken !== undefined) headers['x-date-taken'] = dateTaken;
     if (latitude !== undefined) headers['x-latitude'] = latitude;
     if (longitude !== undefined) headers['x-longitude'] = longitude;
-    if (bucketName !== undefined) headers['x-bucket-name'] = bucketName;
-    if (photoIndex !== undefined) headers['x-photo-index'] = photoIndex;
+    if (ocr !== undefined) headers['x-ocr'] = ocr;
     const resp = await fetch(baseUrl + `/photo_upload`, {
       method: 'POST',
       headers,
@@ -1317,7 +1323,7 @@ class Photoupload {
       this._caches['_get_template'].set(_cacheKey_get_template, template);
     }
 
-    const upload_result = await this.uploadPhotoToMediaviz({ fileContent: photo.fileContent, mimetype: photo.mimetype, filePath: photo.filePath }, { companyId: companyId, userId: userId, projectTableName: projectTableName, clientSideId: photo.clientSideId, title: photo.title, blur: photo.blur, colors: photo.colors, faceRecognition: photo.faceRecognition, imageDescribe: photo.imageDescribe, imageClassification: photo.imageClassification, imageComparison: photo.imageComparison, size: photo.size, sourceResolutionX: photo.sourceResolutionX, sourceResolutionY: photo.sourceResolutionY, dateTaken: photo.dateTaken, latitude: photo.latitude, longitude: photo.longitude, bucketName: template.bucket_name, photoIndex: photoIndex });
+    const upload_result = await this.uploadPhotoToMediaviz(companyId, userId, projectTableName, photo.title, { fileContent: photo.fileContent, mimetype: photo.mimetype, filePath: photo.filePath }, { clientSideId: photo.clientSideId, blur: photo.blur, colors: photo.colors, faceRecognition: photo.faceRecognition, imageDescribe: photo.imageDescribe, imageClassification: photo.imageClassification, imageComparison: photo.imageComparison, size: photo.size, sourceResolutionX: photo.sourceResolutionX, sourceResolutionY: photo.sourceResolutionY, dateTaken: photo.dateTaken, latitude: photo.latitude, longitude: photo.longitude });
 
     return upload_result;
   }
@@ -1326,13 +1332,6 @@ class Photoupload {
 class Photos {
   constructor(ctx) { this._ctx = ctx; }
 
-  async addPhotoToProject({ photo, tableName, sourceResolutionX, sourceResolutionY, dateTaken, latitude, longitude, filePath, title, clientSideId }) {
-    this._ctx.requireTokens();
-    const path = `/api/v1/photos/`;
-    const { data } = await this._ctx.client.request(path, 'POST', this._ctx.accessToken, this._ctx.refreshToken, { photo, table_name: tableName, source_resolution_x: sourceResolutionX, source_resolution_y: sourceResolutionY, date_taken: dateTaken, latitude, longitude, file_path: filePath, title, client_side_id: clientSideId });
-    return data;
-  }
-
   async getPhotoFromProject(tableName, photoId, { keywordListId } = {}) {
     this._ctx.requireTokens();
     let path = `/api/v1/photos/${encodeURIComponent(tableName)}/${encodeURIComponent(photoId)}`;
@@ -1430,6 +1429,8 @@ class Photos {
   }
 }
 
+function stripUndef$1(o) { const r = {}; for (const k in o) if (o[k] !== undefined) r[k] = o[k]; return r; }
+
 class Search {
   constructor(ctx) { this._ctx = ctx; }
 
@@ -1458,6 +1459,60 @@ class Search {
     return data;
   }
 
+  async searchProjectPhotosText(projectTableName, searchText, size = undefined) {
+    this._ctx.requireTokens();
+    const path = `/api/v1/search/text/${encodeURIComponent(projectTableName)}/`;
+    const body = stripUndef$1({
+      search_text: searchText,
+      size: size,
+    });
+    const { data } = await this._ctx.client.request(path, 'POST', this._ctx.accessToken, this._ctx.refreshToken, body);
+    return data;
+  }
+
+  async searchProjectPhotosNaturalLanguage(projectTableName, searchText, size = undefined) {
+    this._ctx.requireTokens();
+    const path = `/api/v1/search/nl/${encodeURIComponent(projectTableName)}/`;
+    const body = stripUndef$1({
+      search_text: searchText,
+      size: size,
+    });
+    const { data } = await this._ctx.client.request(path, 'POST', this._ctx.accessToken, this._ctx.refreshToken, body);
+    return data;
+  }
+
+  async searchProjectPhotosNaturalLanguageHybrid(projectTableName, searchText, size = undefined, { blend, minCosine } = {}) {
+    this._ctx.requireTokens();
+    let path = `/api/v1/search/nl_hybrid/${encodeURIComponent(projectTableName)}/`;
+    const query = new URLSearchParams();
+    if (blend !== undefined) (Array.isArray(blend) ? blend : [blend]).forEach(v => query.append('blend', v));
+    if (minCosine !== undefined) (Array.isArray(minCosine) ? minCosine : [minCosine]).forEach(v => query.append('min_cosine', v));
+    const qs = query.toString();
+    if (qs) path += '?' + qs;
+    const body = stripUndef$1({
+      search_text: searchText,
+      size: size,
+    });
+    const { data } = await this._ctx.client.request(path, 'POST', this._ctx.accessToken, this._ctx.refreshToken, body);
+    return data;
+  }
+
+  async searchProjectPhotosNaturalLanguageAuto(projectTableName, searchText, size = undefined, { blend, minCosine } = {}) {
+    this._ctx.requireTokens();
+    let path = `/api/v1/search/auto/${encodeURIComponent(projectTableName)}/`;
+    const query = new URLSearchParams();
+    if (blend !== undefined) (Array.isArray(blend) ? blend : [blend]).forEach(v => query.append('blend', v));
+    if (minCosine !== undefined) (Array.isArray(minCosine) ? minCosine : [minCosine]).forEach(v => query.append('min_cosine', v));
+    const qs = query.toString();
+    if (qs) path += '?' + qs;
+    const body = stripUndef$1({
+      search_text: searchText,
+      size: size,
+    });
+    const { data } = await this._ctx.client.request(path, 'POST', this._ctx.accessToken, this._ctx.refreshToken, body);
+    return data;
+  }
+
   async getProjectSavedSearches(projectTableName) {
     this._ctx.requireTokens();
     const path = `/api/v1/search/saved/${encodeURIComponent(projectTableName)}/`;

package/dist/sdk.umd.js

@@ -485,7 +485,7 @@
 	  }
 	}
 
-	function stripUndef$5(o) { const r = {}; for (const k in o) if (o[k] !== undefined) r[k] = o[k]; return r; }
+	function stripUndef$6(o) { const r = {}; for (const k in o) if (o[k] !== undefined) r[k] = o[k]; return r; }
 
 	class CuratedAlbums {
 	  constructor(ctx) { this._ctx = ctx; }
@@ -493,7 +493,7 @@
 	  async createCuratedAlbum(projectTableName, name, description = undefined, confidenceValue = undefined) {
 	    this._ctx.requireTokens();
 	    const path = `/api/v1/curated_album/project/${encodeURIComponent(projectTableName)}`;
-	    const body = stripUndef$5({
+	    const body = stripUndef$6({
 	      name: name,
 	      description: description,
 	      confidence_value: confidenceValue,
@@ -547,7 +547,7 @@
 	  async updateCuratedAlbum(albumId, { name, description, confidenceValue } = {}) {
 	    this._ctx.requireTokens();
 	    const path = `/api/v1/curated_album/${encodeURIComponent(albumId)}`;
-	    const body = stripUndef$5({
+	    const body = stripUndef$6({
 	      name: name,
 	      description: description,
 	      confidence_value: confidenceValue,
@@ -571,7 +571,7 @@
 	  }
 	}
 
-	function stripUndef$4(o) { const r = {}; for (const k in o) if (o[k] !== undefined) r[k] = o[k]; return r; }
+	function stripUndef$5(o) { const r = {}; for (const k in o) if (o[k] !== undefined) r[k] = o[k]; return r; }
 
 	class CustomAlbums {
 	  constructor(ctx) { this._ctx = ctx; }
@@ -619,7 +619,7 @@
 	  async createProjectCustomAlbum(projectTableName, { name, description, photoIdInclusionList, photoIdRemovalList } = {}) {
 	    this._ctx.requireTokens();
 	    const path = `/api/v1/custom_album/project/${encodeURIComponent(projectTableName)}`;
-	    const body = stripUndef$4({
+	    const body = stripUndef$5({
 	      name: name,
 	      description: description,
 	      photo_id_inclusion_list: photoIdInclusionList,
@@ -632,7 +632,7 @@
 	  async updateCustomAlbum(albumId, { name, description, photoIdInclusionList, photoIdRemovalList } = {}) {
 	    this._ctx.requireTokens();
 	    const path = `/api/v1/custom_album/${encodeURIComponent(albumId)}`;
-	    const body = stripUndef$4({
+	    const body = stripUndef$5({
 	      name: name,
 	      description: description,
 	      photo_id_inclusion_list: photoIdInclusionList,
@@ -732,7 +732,7 @@
 	  }
 	}
 
-	function stripUndef$3(o) { const r = {}; for (const k in o) if (o[k] !== undefined) r[k] = o[k]; return r; }
+	function stripUndef$4(o) { const r = {}; for (const k in o) if (o[k] !== undefined) r[k] = o[k]; return r; }
 
 	class EmailTokens {
 	  constructor(ctx) { this._ctx = ctx; }
@@ -763,7 +763,7 @@
 	  }
 
 	  async validateToken(token) {
-	    const body = stripUndef$3({
+	    const body = stripUndef$4({
 	      token: token,
 	    });
 	    const resp = await fetch(this._ctx.baseUrl + `/api/v1/validate-token`, {
@@ -775,7 +775,7 @@
 	  }
 
 	  async resetPassword(token, newPassword) {
-	    const body = stripUndef$3({
+	    const body = stripUndef$4({
 	      token: token,
 	      new_password: newPassword,
 	    });
@@ -814,7 +814,7 @@
 	  }
 	}
 
-	function stripUndef$2(o) { const r = {}; for (const k in o) if (o[k] !== undefined) r[k] = o[k]; return r; }
+	function stripUndef$3(o) { const r = {}; for (const k in o) if (o[k] !== undefined) r[k] = o[k]; return r; }
 
 	class Keywords {
 	  constructor(ctx) { this._ctx = ctx; }
@@ -822,7 +822,7 @@
 	  async createKeywordFilteringList(name, projectList = undefined) {
 	    this._ctx.requireTokens();
 	    const path = `/api/v1/keyword/`;
-	    const body = stripUndef$2({
+	    const body = stripUndef$3({
 	      name: name,
 	      project_list: projectList,
 	    });
@@ -837,6 +837,13 @@
 	    return data;
 	  }
 
+	  async getCompanyKeywordLists(companyId) {
+	    this._ctx.requireTokens();
+	    const path = `/api/v1/keyword/company/${encodeURIComponent(companyId)}`;
+	    const { data } = await this._ctx.client.request(path, 'GET', this._ctx.accessToken, this._ctx.refreshToken);
+	    return data;
+	  }
+
 	  async getKeywordFilteringListAndProjectsById(keywordListId) {
 	    this._ctx.requireTokens();
 	    const path = `/api/v1/keyword/${encodeURIComponent(keywordListId)}`;
@@ -868,7 +875,7 @@
 	  async updateKeywordFilteringListLabels(keywordListId, listKeywordsToInclude, listKeywordsToExclude) {
 	    this._ctx.requireTokens();
 	    const path = `/api/v1/keyword/${encodeURIComponent(keywordListId)}`;
-	    const body = stripUndef$2({
+	    const body = stripUndef$3({
 	      list_keywords_to_include: listKeywordsToInclude,
 	      list_keywords_to_exclude: listKeywordsToExclude,
 	    });
@@ -879,7 +886,7 @@
 	  async updateKeywordFilteringListDetails(keywordListId, { name, projectList } = {}) {
 	    this._ctx.requireTokens();
 	    const path = `/api/v1/keyword/details/${encodeURIComponent(keywordListId)}`;
-	    const body = stripUndef$2({
+	    const body = stripUndef$3({
 	      name: name,
 	      project_list: projectList,
 	    });
@@ -1097,7 +1104,7 @@
 	  }
 	}
 
-	function stripUndef$1(o) { const r = {}; for (const k in o) if (o[k] !== undefined) r[k] = o[k]; return r; }
+	function stripUndef$2(o) { const r = {}; for (const k in o) if (o[k] !== undefined) r[k] = o[k]; return r; }
 
 	class Projects {
 	  constructor(ctx) { this._ctx = ctx; }
@@ -1110,7 +1117,7 @@
 	    if (models !== undefined) (Array.isArray(models) ? models : [models]).forEach(v => query.append('models', v));
 	    const qs = query.toString();
 	    if (qs) path += '?' + qs;
-	    const body = stripUndef$1({
+	    const body = stripUndef$2({
 	      name: name,
 	      private: private_,
 	      type: type,
@@ -1180,7 +1187,7 @@
 	  async updateProject(projectId, { private: private_, type, description, directory, name, thumbnail } = {}) {
 	    this._ctx.requireTokens();
 	    const path = `/api/v1/projects/${encodeURIComponent(projectId)}`;
-	    const body = stripUndef$1({
+	    const body = stripUndef$2({
 	      private: private_,
 	      type: type,
 	      description: description,
@@ -1259,7 +1266,7 @@
 	  async addProjectEvent(projectTableName, event, detail = undefined) {
 	    this._ctx.requireTokens();
 	    const path = `/api/v1/projects/${encodeURIComponent(projectTableName)}/event`;
-	    const body = stripUndef$1({
+	    const body = stripUndef$2({
 	      event: event,
 	      detail: detail,
 	    });
@@ -1278,18 +1285,18 @@
 	class Photoupload {
 	  constructor(ctx) { this._ctx = ctx; this._caches = {}; }
 
-	  async uploadPhotoToMediaviz({ fileContent, mimetype, filePath }, { companyId, userId, projectTableName, clientSideId, title, blur, colors, faceRecognition, imageDescribe, imageClassification, imageComparison, size, sourceResolutionX, sourceResolutionY, dateTaken, latitude, longitude, bucketName, photoIndex } = {}) {
+	  async uploadPhotoToMediaviz(companyId, userId, projectTableName, title, { fileContent, mimetype, filePath }, { clientSideId, blur, colors, faceRecognition, imageDescribe, imageClassification, imageComparison, size, sourceResolutionX, sourceResolutionY, dateTaken, latitude, longitude, ocr } = {}) {
 	    this._ctx.requireTokens();
 	    const baseUrl = this._ctx.requireHost('photoUpload');
 	    const headers = {
 	      'Content-Type': 'application/json',
 	      'Authorization': this._ctx.accessToken,
+	      'x-company-id': companyId,
+	      'x-user-id': userId,
+	      'x-project-table-name': projectTableName,
+	      'x-title': title,
 	    };
-	    if (companyId !== undefined) headers['x-company-id'] = companyId;
-	    if (userId !== undefined) headers['x-user-id'] = userId;
-	    if (projectTableName !== undefined) headers['x-project-table-name'] = projectTableName;
 	    if (clientSideId !== undefined) headers['x-client-side-id'] = clientSideId;
-	    if (title !== undefined) headers['x-title'] = title;
 	    if (blur !== undefined) headers['x-blur'] = blur;
 	    if (colors !== undefined) headers['x-colors'] = colors;
 	    if (faceRecognition !== undefined) headers['x-face-recognition'] = faceRecognition;
@@ -1302,8 +1309,7 @@
 	    if (dateTaken !== undefined) headers['x-date-taken'] = dateTaken;
 	    if (latitude !== undefined) headers['x-latitude'] = latitude;
 	    if (longitude !== undefined) headers['x-longitude'] = longitude;
-	    if (bucketName !== undefined) headers['x-bucket-name'] = bucketName;
-	    if (photoIndex !== undefined) headers['x-photo-index'] = photoIndex;
+	    if (ocr !== undefined) headers['x-ocr'] = ocr;
 	    const resp = await fetch(baseUrl + `/photo_upload`, {
 	      method: 'POST',
 	      headers,
@@ -1323,7 +1329,7 @@
 	      this._caches['_get_template'].set(_cacheKey_get_template, template);
 	    }
 
-	    const upload_result = await this.uploadPhotoToMediaviz({ fileContent: photo.fileContent, mimetype: photo.mimetype, filePath: photo.filePath }, { companyId: companyId, userId: userId, projectTableName: projectTableName, clientSideId: photo.clientSideId, title: photo.title, blur: photo.blur, colors: photo.colors, faceRecognition: photo.faceRecognition, imageDescribe: photo.imageDescribe, imageClassification: photo.imageClassification, imageComparison: photo.imageComparison, size: photo.size, sourceResolutionX: photo.sourceResolutionX, sourceResolutionY: photo.sourceResolutionY, dateTaken: photo.dateTaken, latitude: photo.latitude, longitude: photo.longitude, bucketName: template.bucket_name, photoIndex: photoIndex });
+	    const upload_result = await this.uploadPhotoToMediaviz(companyId, userId, projectTableName, photo.title, { fileContent: photo.fileContent, mimetype: photo.mimetype, filePath: photo.filePath }, { clientSideId: photo.clientSideId, blur: photo.blur, colors: photo.colors, faceRecognition: photo.faceRecognition, imageDescribe: photo.imageDescribe, imageClassification: photo.imageClassification, imageComparison: photo.imageComparison, size: photo.size, sourceResolutionX: photo.sourceResolutionX, sourceResolutionY: photo.sourceResolutionY, dateTaken: photo.dateTaken, latitude: photo.latitude, longitude: photo.longitude });
 
 	    return upload_result;
 	  }
@@ -1332,13 +1338,6 @@
 	class Photos {
 	  constructor(ctx) { this._ctx = ctx; }
 
-	  async addPhotoToProject({ photo, tableName, sourceResolutionX, sourceResolutionY, dateTaken, latitude, longitude, filePath, title, clientSideId }) {
-	    this._ctx.requireTokens();
-	    const path = `/api/v1/photos/`;
-	    const { data } = await this._ctx.client.request(path, 'POST', this._ctx.accessToken, this._ctx.refreshToken, { photo, table_name: tableName, source_resolution_x: sourceResolutionX, source_resolution_y: sourceResolutionY, date_taken: dateTaken, latitude, longitude, file_path: filePath, title, client_side_id: clientSideId });
-	    return data;
-	  }
-
 	  async getPhotoFromProject(tableName, photoId, { keywordListId } = {}) {
 	    this._ctx.requireTokens();
 	    let path = `/api/v1/photos/${encodeURIComponent(tableName)}/${encodeURIComponent(photoId)}`;
@@ -1436,6 +1435,8 @@
 	  }
 	}
 
+	function stripUndef$1(o) { const r = {}; for (const k in o) if (o[k] !== undefined) r[k] = o[k]; return r; }
+
 	class Search {
 	  constructor(ctx) { this._ctx = ctx; }
 
@@ -1464,6 +1465,60 @@
 	    return data;
 	  }
 
+	  async searchProjectPhotosText(projectTableName, searchText, size = undefined) {
+	    this._ctx.requireTokens();
+	    const path = `/api/v1/search/text/${encodeURIComponent(projectTableName)}/`;
+	    const body = stripUndef$1({
+	      search_text: searchText,
+	      size: size,
+	    });
+	    const { data } = await this._ctx.client.request(path, 'POST', this._ctx.accessToken, this._ctx.refreshToken, body);
+	    return data;
+	  }
+
+	  async searchProjectPhotosNaturalLanguage(projectTableName, searchText, size = undefined) {
+	    this._ctx.requireTokens();
+	    const path = `/api/v1/search/nl/${encodeURIComponent(projectTableName)}/`;
+	    const body = stripUndef$1({
+	      search_text: searchText,
+	      size: size,
+	    });
+	    const { data } = await this._ctx.client.request(path, 'POST', this._ctx.accessToken, this._ctx.refreshToken, body);
+	    return data;
+	  }
+
+	  async searchProjectPhotosNaturalLanguageHybrid(projectTableName, searchText, size = undefined, { blend, minCosine } = {}) {
+	    this._ctx.requireTokens();
+	    let path = `/api/v1/search/nl_hybrid/${encodeURIComponent(projectTableName)}/`;
+	    const query = new URLSearchParams();
+	    if (blend !== undefined) (Array.isArray(blend) ? blend : [blend]).forEach(v => query.append('blend', v));
+	    if (minCosine !== undefined) (Array.isArray(minCosine) ? minCosine : [minCosine]).forEach(v => query.append('min_cosine', v));
+	    const qs = query.toString();
+	    if (qs) path += '?' + qs;
+	    const body = stripUndef$1({
+	      search_text: searchText,
+	      size: size,
+	    });
+	    const { data } = await this._ctx.client.request(path, 'POST', this._ctx.accessToken, this._ctx.refreshToken, body);
+	    return data;
+	  }
+
+	  async searchProjectPhotosNaturalLanguageAuto(projectTableName, searchText, size = undefined, { blend, minCosine } = {}) {
+	    this._ctx.requireTokens();
+	    let path = `/api/v1/search/auto/${encodeURIComponent(projectTableName)}/`;
+	    const query = new URLSearchParams();
+	    if (blend !== undefined) (Array.isArray(blend) ? blend : [blend]).forEach(v => query.append('blend', v));
+	    if (minCosine !== undefined) (Array.isArray(minCosine) ? minCosine : [minCosine]).forEach(v => query.append('min_cosine', v));
+	    const qs = query.toString();
+	    if (qs) path += '?' + qs;
+	    const body = stripUndef$1({
+	      search_text: searchText,
+	      size: size,
+	    });
+	    const { data } = await this._ctx.client.request(path, 'POST', this._ctx.accessToken, this._ctx.refreshToken, body);
+	    return data;
+	  }
+
 	  async getProjectSavedSearches(projectTableName) {
 	    this._ctx.requireTokens();
 	    const path = `/api/v1/search/saved/${encodeURIComponent(projectTableName)}/`;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@mediaviz/sdk",
-  "version": "1.0.60",
+  "version": "1.0.62",
   "description": "MediaViz JavaScript SDK \u2014 auto-generated public endpoint client.",
   "license": "MIT",
   "repository": {