diff --git a/src/components/projects/projectId/settings/embeddings/AddNewEmbeddingModal.tsx b/src/components/projects/projectId/settings/embeddings/AddNewEmbeddingModal.tsx index 61bafc80..fe1f3249 100644 --- a/src/components/projects/projectId/settings/embeddings/AddNewEmbeddingModal.tsx +++ b/src/components/projects/projectId/settings/embeddings/AddNewEmbeddingModal.tsx @@ -109,7 +109,7 @@ export default function AddNewEmbeddingModal() { function changePlatformOrGranularity() { prepareSuggestions(); const savePlatform = platform.platform; - if (savePlatform == PlatformType.COHERE || savePlatform == PlatformType.OPEN_AI || savePlatform == PlatformType.AZURE) { + if (savePlatform == PlatformType.OPEN_AI || savePlatform == PlatformType.AZURE) { setGranularity(GRANULARITY_TYPES_ARRAY.find((g) => g.value == EmbeddingType.ON_ATTRIBUTE)); if (savePlatform == PlatformType.AZURE) { const azureUrls = localStorage.getItem('azureUrls'); @@ -137,7 +137,7 @@ export default function AddNewEmbeddingModal() { function checkIfPlatformHasToken() { if (!platform) return; - if (platform.name == platformNamesDict[PlatformType.COHERE] || platform.name == platformNamesDict[PlatformType.OPEN_AI] || platform.name == platformNamesDict[PlatformType.AZURE]) { + if (platform.name == platformNamesDict[PlatformType.OPEN_AI] || platform.name == platformNamesDict[PlatformType.AZURE]) { setGranularityArray(GRANULARITY_TYPES_ARRAY.filter((g) => g.value != EmbeddingType.ON_TOKEN)); } else { setGranularityArray(GRANULARITY_TYPES_ARRAY); @@ -179,13 +179,11 @@ export default function AddNewEmbeddingModal() { filterAttributes: filteredAttributes } - if (platform.name == platformNamesDict[PlatformType.HUGGING_FACE] || platform.name == platformNamesDict[PlatformType.PYTHON]) { + if (platform.name == platformNamesDict[PlatformType.HUGGING_FACE]) { config.model = model; } else if (platform.name == platformNamesDict[PlatformType.OPEN_AI]) { config.model = model; config.apiToken = apiToken; - } else if (platform.name == platformNamesDict[PlatformType.COHERE]) { - config.apiToken = apiToken; } else if (platform.name == platformNamesDict[PlatformType.AZURE]) { config.model = engine; //note that is handled internally as model so we use the model field for the request config.apiToken = apiToken; @@ -251,15 +249,6 @@ export default function AddNewEmbeddingModal() { setApiToken(e.target.value)} value={apiToken} className="h-9 w-full text-sm border-gray-300 rounded-md placeholder-italic border text-gray-900 pl-4 placeholder:text-gray-400 focus:outline-none focus:ring-2 focus:ring-gray-300 focus:ring-offset-2 focus:ring-offset-gray-100" /> >} - {platform && platform.name == platformNamesDict[PlatformType.COHERE] && <> - - API token - - setApiToken(e.target.value)} value={apiToken} - className="h-9 w-full text-sm border-gray-300 rounded-md placeholder-italic border text-gray-900 pl-4 placeholder:text-gray-400 focus:outline-none focus:ring-2 focus:ring-gray-300 focus:ring-offset-2 focus:ring-offset-gray-100" /> - >} - {platform && platform.name == platformNamesDict[PlatformType.PYTHON] && setModel(option)} />} - {platform && platform.name == platformNamesDict[PlatformType.AZURE] && <> API token @@ -302,11 +291,10 @@ export default function AddNewEmbeddingModal() { >} >} - {platform && (platform.name == platformNamesDict[PlatformType.COHERE] || platform.name == platformNamesDict[PlatformType.OPEN_AI] || platform.name == platformNamesDict[PlatformType.AZURE]) && + {platform && (platform.name == platformNamesDict[PlatformType.OPEN_AI] || platform.name == platformNamesDict[PlatformType.AZURE]) && {selectedPlatform.splitTerms[0]} - {platform.name == platformNamesDict[PlatformType.COHERE] && cohere terms of service.} {platform.name == platformNamesDict[PlatformType.OPEN_AI] && openai terms of service.} {platform.name == platformNamesDict[PlatformType.AZURE] && azure terms of service.} {selectedPlatform.splitTerms[1]} diff --git a/src/components/shared/upload/helper-components/UploadWrapper.tsx b/src/components/shared/upload/helper-components/UploadWrapper.tsx index da56f4a8..1465ef03 100644 --- a/src/components/shared/upload/helper-components/UploadWrapper.tsx +++ b/src/components/shared/upload/helper-components/UploadWrapper.tsx @@ -19,7 +19,7 @@ export default function UploadWrapper(props: UploadWrapperProps) { const uploadFileType = useSelector(selectUploadData).uploadFileType; const importOptions = useSelector(selectUploadData).importOptions; const embeddings = useSelector(selectEmbeddings); - const recalculationCosts = embeddings.some((e: Embedding) => e.platform == PlatformType.COHERE || e.platform == PlatformType.OPEN_AI || e.platform == PlatformType.AZURE); + const recalculationCosts = embeddings.some((e: Embedding) => e.platform == PlatformType.OPEN_AI || e.platform == PlatformType.AZURE); const [selectedFile, setSelectedFile] = useState(null); const [fileEndsWithZip, setFileEndsWithZip] = useState(false); diff --git a/src/types/components/projects/projectId/settings/embeddings.ts b/src/types/components/projects/projectId/settings/embeddings.ts index 874fd411..4b5f9d98 100644 --- a/src/types/components/projects/projectId/settings/embeddings.ts +++ b/src/types/components/projects/projectId/settings/embeddings.ts @@ -46,8 +46,6 @@ export type EmbeddingPlatform = { export enum PlatformType { HUGGING_FACE = "huggingface", OPEN_AI = "openai", - COHERE = "cohere", - PYTHON = "python", AZURE = "azure" } diff --git a/src/util/components/projects/projectId/settings/embeddings-helper.ts b/src/util/components/projects/projectId/settings/embeddings-helper.ts index f3d24f6d..401e85a0 100644 --- a/src/util/components/projects/projectId/settings/embeddings-helper.ts +++ b/src/util/components/projects/projectId/settings/embeddings-helper.ts @@ -46,8 +46,6 @@ export function postProcessingEmbeddingPlatforms(platforms: EmbeddingPlatform[], export const platformNamesDict = { [PlatformType.HUGGING_FACE]: "Hugging Face", [PlatformType.OPEN_AI]: "OpenAI", - [PlatformType.COHERE]: "Cohere", - [PlatformType.PYTHON]: "Python", [PlatformType.AZURE]: "Azure" } @@ -73,9 +71,9 @@ function buildExpectedEmbeddingName(data: any): string { let toReturn = data.targetAttribute.name; toReturn += "-" + (data.granularity.value == EmbeddingType.ON_ATTRIBUTE ? 'classification' : 'extraction'); const platform = data.platform; - if (platform == PlatformType.HUGGING_FACE || platform == PlatformType.PYTHON) { + if (platform == PlatformType.HUGGING_FACE) { toReturn += "-" + platform + "-" + data.model; - } else if (platform == PlatformType.OPEN_AI || platform == PlatformType.COHERE || platform == PlatformType.AZURE) { + } else if (platform == PlatformType.OPEN_AI || platform == PlatformType.AZURE) { toReturn += buildEmbeddingNameWithApiToken(data); } return toReturn; @@ -106,12 +104,10 @@ export function checkIfCreateEmbeddingIsDisabled(props: EmbeddingCreationEnabled const engine = props.engine; const version = props.version; const url = props.url; - if (platform.name == platformNamesDict[PlatformType.HUGGING_FACE] || platform.name == platformNamesDict[PlatformType.PYTHON]) { + if (platform.name == platformNamesDict[PlatformType.HUGGING_FACE]) { checkFormFields = model == null || model == ""; } else if (platform.name == platformNamesDict[PlatformType.OPEN_AI]) { checkFormFields = model == null || apiToken == null || apiToken == "" || !termsAccepted; - } else if (platform.name == platformNamesDict[PlatformType.COHERE]) { - checkFormFields = apiToken == null || apiToken == "" || !termsAccepted; } else if (platform.name == platformNamesDict[PlatformType.AZURE]) { checkFormFields = apiToken == null || apiToken == "" || url == null || url == "" || version == null || version == "" || !termsAccepted || !engine; } diff --git a/src/util/components/projects/projectId/settings/project-export-helper.ts b/src/util/components/projects/projectId/settings/project-export-helper.ts index 86ff72b3..cbffddd4 100644 --- a/src/util/components/projects/projectId/settings/project-export-helper.ts +++ b/src/util/components/projects/projectId/settings/project-export-helper.ts @@ -22,7 +22,7 @@ export function postProcessingFormGroups(projectSize: any, embeddings: Embedding projectSize.forEach((element: any) => { let hasGdpr = false; if (element.table == ProjectExportGroup.EMBEDDING_TENSORS) { - hasGdpr = embeddings.some((e: any) => e.name.split("-")[2] == PlatformType.COHERE || e.name.split("-")[2] == PlatformType.OPEN_AI || e.name.split("-")[2] == PlatformType.AZURE); + hasGdpr = embeddings.some((e: any) => e.name.split("-")[2] == PlatformType.OPEN_AI || e.name.split("-")[2] == PlatformType.AZURE); } let group = { export: element.default,