Similary search, evalutation changes for the new attribute type

Author: lumburovskalina

src/components/projects/projectId/data-browser/modals/SimilaritySeachModal.tsx

@@ -95,8 +95,13 @@ export default function SimilaritySearchModal() {
         filterAttributesSS.forEach((attribute: string) => {
             const attributeType = attributes.find(att => att.name == attribute)?.dataType
             if (attributeType !== DataTypeEnum.INTEGER) {
-                operators = operators.filter(operator => operator !== FilterIntegrationOperator.BETWEEN);
-                tooltips = tooltips.filter(tooltip => tooltip !== getFilterIntegrationOperatorTooltip(FilterIntegrationOperator.BETWEEN));
+                if (attributeType == DataTypeEnum.TEXT_LIST) {
+                    operators = operators.filter(operator => operator !== FilterIntegrationOperator.BETWEEN && operator !== FilterIntegrationOperator.IN);
+                    tooltips = tooltips.filter(tooltip => tooltip !== getFilterIntegrationOperatorTooltip(FilterIntegrationOperator.BETWEEN) && tooltip !== getFilterIntegrationOperatorTooltip(FilterIntegrationOperator.IN));
+                } else {
+                    operators = operators.filter(operator => operator !== FilterIntegrationOperator.BETWEEN);
+                    tooltips = tooltips.filter(tooltip => tooltip !== getFilterIntegrationOperatorTooltip(FilterIntegrationOperator.BETWEEN));
+                }
             }
             operatorsCopy[attribute] = operators;
             tooltipsCopy[attribute] = tooltips;

src/components/projects/projectId/edit-records/EditField.tsx

@@ -114,7 +114,7 @@ export default function EditField(props: EditFieldProps) {
                 type="checkbox"
                 className="w-6 "
             />}
-        {props.attribute.dataType == DataTypeEnum.EMBEDDING_LIST &&
+        {(props.attribute.dataType == DataTypeEnum.EMBEDDING_LIST || props.attribute.dataType == DataTypeEnum.TEXT_LIST) &&
             <textarea value={inputValue} ref={inputRef}
                 onChange={(e) => setInputValue(e.target.value)}
                 onInput={setDynamicStyles}

src/components/projects/projectId/edit-records/EditRecords.tsx

@@ -97,7 +97,7 @@ export default function EditRecords() {
                                         </div>
                                     </div>
                                     <div className="text-gray-800 text-sm mb-4 overflow-anywhere flex">
-                                        {attribute.dataType == DataTypeEnum.EMBEDDING_LIST ? (<div className="flex flex-col gap-y-1 divide-y w-full">
+                                        {(attribute.dataType == DataTypeEnum.EMBEDDING_LIST || attribute.dataType == DataTypeEnum.TEXT_LIST) ? (<div className="flex flex-col gap-y-1 divide-y w-full">
                                             {record.data[attribute.name].map((item, subKey) => (<div key={subKey} className="pt-1">
                                                 {(record.id == erdData.editRecordId && !attribute.isPrimaryKey) ?
                                                     <EditField attribute={attribute} record={record} subKey={subKey} erdData={erdData} setErdData={(erdData) => setErdData(erdData)} /> : <>

src/components/projects/projectId/playground/PlaygroundSearchMetaFilterModal.tsx

@@ -58,9 +58,14 @@ export default function PlaygroundSearchMetaFilterModal(props: { selectedEmbeddi
         const newTooltipsDict = {};
 
         filterAttributesSS.forEach((attribute) => {
-            const attributeType = attributes.find(att => att.name == attribute)?.dataType
-            newOperatorsDict[attribute] = FILTER_INTEGRATION_OPERATORS.filter(operator => attributeType == DataTypeEnum.INTEGER || operator !== FilterIntegrationOperator.BETWEEN);
-            newTooltipsDict[attribute] = FILTER_INTEGRATION_OPERATOR_TOOLTIPS.filter(tooltip => attributeType == DataTypeEnum.INTEGER || tooltip !== getFilterIntegrationOperatorTooltip(FilterIntegrationOperator.BETWEEN));
+            const attributeType = attributes.find(att => att.name == attribute)?.dataType;
+            if (attributeType == DataTypeEnum.TEXT_LIST) {
+                newOperatorsDict[attribute] = [FilterIntegrationOperator.EQUAL];
+                newTooltipsDict[attribute] = [getFilterIntegrationOperatorTooltip(FilterIntegrationOperator.EQUAL)];
+            } else {
+                newOperatorsDict[attribute] = FILTER_INTEGRATION_OPERATORS.filter(operator => attributeType == DataTypeEnum.INTEGER || operator !== FilterIntegrationOperator.BETWEEN);
+                newTooltipsDict[attribute] = FILTER_INTEGRATION_OPERATOR_TOOLTIPS.filter(tooltip => attributeType == DataTypeEnum.INTEGER || tooltip !== getFilterIntegrationOperatorTooltip(FilterIntegrationOperator.BETWEEN));
+            }
             colors.push(getColorForDataType(attributeType));
         });
         setOperatorsDict(newOperatorsDict);

src/components/projects/projectId/settings/embeddings/AddNewEmbeddingModal.tsx

@@ -99,7 +99,7 @@ export default function AddNewEmbeddingModal() {
 
     function checkIfAttributeHasToken() {
         const attribute = useableEmbedableAttributes.find((a) => a.id == targetAttribute.id);
-        if (attribute?.dataType == DataTypeEnum.EMBEDDING_LIST) {
+        if (attribute?.dataType == DataTypeEnum.EMBEDDING_LIST || attribute?.dataType == DataTypeEnum.TEXT_LIST) {
             setGranularityArray(GRANULARITY_TYPES_ARRAY.filter((g) => g.value != EmbeddingType.ON_TOKEN));
         } else {
             checkIfPlatformHasToken();

src/util/components/projects/projectId/data-browser/search-groups-helper.ts

@@ -2,6 +2,7 @@ import { SearchGroupElement } from "@/src/types/components/projects/projectId/da
 import { SearchGroupItem, SearchItemType } from "@/src/types/components/projects/projectId/data-browser/search-groups";
 import { SearchOperator } from "@/src/types/components/projects/projectId/data-browser/search-operators";
 import { LabelingTask, LabelingTaskTarget } from "@/src/types/components/projects/projectId/settings/labeling-tasks";
+import { DataTypeEnum } from "@/src/types/shared/general";
 import { getOrderByDisplayName, nameForGroupKeyToString } from "@/submodules/javascript-functions/enums/enum-functions";
 import { InformationSourceType, SearchGroup, StaticOrderByKeys } from "@/submodules/javascript-functions/enums/enums";
 
@@ -233,8 +234,9 @@ export function orderByCreateSearchGroup(item, globalSearchGroupCount, attribute
 
 function orderByArray(attributesSortOrder: any[] = [], attributesDict: any) {
     let array = [];
-    for (let i = 1; i < attributesSortOrder.length; i++) {
-        array.push(getOrderByGroup(attributesDict[attributesSortOrder[i].key].name, true, -1)) //1, //-1 desc, 1 asc     
+    const finalAttributesSortOrder = attributesSortOrder.filter((a) => a.type !== DataTypeEnum.TEXT_LIST);
+    for (let i = 1; i < finalAttributesSortOrder.length; i++) {
+        array.push(getOrderByGroup(attributesDict[finalAttributesSortOrder[i].key].name, true, -1)) //1, //-1 desc, 1 asc
     }
     array.push(getOrderByGroup(StaticOrderByKeys.WEAK_SUPERVISION_CONFIDENCE, false, -1));
     array.push(getOrderByGroup(StaticOrderByKeys.RANDOM, false, -1));