orca-sdk 0.0.94__py3-none-any.whl → 0.0.96__py3-none-any.whl

orca_sdk/_generated_api_client/models/{prediction_request.py → classification_prediction_request.py}

@@ -10,22 +10,27 @@ The main change is:
 
 # flake8: noqa: C901
 
-from typing import Any, List, Type, TypeVar, Union, cast
+from typing import TYPE_CHECKING, Any, Dict, List, Type, TypeVar, Union, cast
 
 from attrs import define as _attrs_define
 from attrs import field as _attrs_field
 
 from ..types import UNSET, Unset
 
-T = TypeVar("T", bound="PredictionRequest")
+if TYPE_CHECKING:
+    from ..models.filter_item import FilterItem
+
+
+T = TypeVar("T", bound="ClassificationPredictionRequest")
 
 
 @_attrs_define
-class PredictionRequest:
+class ClassificationPredictionRequest:
     """
     Attributes:
         input_values (List[str]):
         expected_labels (Union[List[int], None, Unset]):
+        filters (Union[Unset, List['FilterItem']]):
         tags (Union[Unset, List[str]]):
         memoryset_override_id (Union[None, Unset, str]):
         save_telemetry (Union[Unset, bool]):  Default: True.
@@ -34,6 +39,7 @@ class PredictionRequest:
 
     input_values: List[str]
     expected_labels: Union[List[int], None, Unset] = UNSET
+    filters: Union[Unset, List["FilterItem"]] = UNSET
     tags: Union[Unset, List[str]] = UNSET
     memoryset_override_id: Union[None, Unset, str] = UNSET
     save_telemetry: Union[Unset, bool] = True
@@ -54,6 +60,13 @@ class PredictionRequest:
         else:
             expected_labels = self.expected_labels
 
+        filters: Union[Unset, List[Dict[str, Any]]] = UNSET
+        if not isinstance(self.filters, Unset):
+            filters = []
+            for filters_item_data in self.filters:
+                filters_item = filters_item_data.to_dict()
+                filters.append(filters_item)
+
         tags: Union[Unset, List[str]] = UNSET
         if not isinstance(self.tags, Unset):
             tags = self.tags
@@ -77,6 +90,8 @@ class PredictionRequest:
         )
         if expected_labels is not UNSET:
             field_dict["expected_labels"] = expected_labels
+        if filters is not UNSET:
+            field_dict["filters"] = filters
         if tags is not UNSET:
             field_dict["tags"] = tags
         if memoryset_override_id is not UNSET:
@@ -90,6 +105,8 @@ class PredictionRequest:
 
     @classmethod
     def from_dict(cls: Type[T], src_dict: dict[str, Any]) -> T:
+        from ..models.filter_item import FilterItem
+
         d = src_dict.copy()
 
         def _parse_input_values(data: object) -> List[str]:
@@ -151,6 +168,13 @@ class PredictionRequest:
 
         expected_labels = _parse_expected_labels(d.pop("expected_labels", UNSET))
 
+        filters = []
+        _filters = d.pop("filters", UNSET)
+        for filters_item_data in _filters or []:
+            filters_item = FilterItem.from_dict(filters_item_data)
+
+            filters.append(filters_item)
+
         tags = cast(List[str], d.pop("tags", UNSET))
 
         def _parse_memoryset_override_id(data: object) -> Union[None, Unset, str]:
@@ -166,17 +190,18 @@ class PredictionRequest:
 
         save_telemetry_synchronously = d.pop("save_telemetry_synchronously", UNSET)
 
-        prediction_request = cls(
+        classification_prediction_request = cls(
             input_values=input_values,
             expected_labels=expected_labels,
+            filters=filters,
             tags=tags,
             memoryset_override_id=memoryset_override_id,
             save_telemetry=save_telemetry,
             save_telemetry_synchronously=save_telemetry_synchronously,
         )
 
-        prediction_request.additional_properties = d
-        return prediction_request
+        classification_prediction_request.additional_properties = d
+        return classification_prediction_request
 
     @property
     def additional_keys(self) -> list[str]:

orca_sdk/_generated_api_client/models/{clone_labeled_memoryset_request.py → clone_memoryset_request.py}

@@ -19,11 +19,11 @@ from attrs import field as _attrs_field
 from ..models.pretrained_embedding_model_name import PretrainedEmbeddingModelName
 from ..types import UNSET, Unset
 
-T = TypeVar("T", bound="CloneLabeledMemorysetRequest")
+T = TypeVar("T", bound="CloneMemorysetRequest")
 
 
 @_attrs_define
-class CloneLabeledMemorysetRequest:
+class CloneMemorysetRequest:
     """
     Attributes:
         name (str):
@@ -142,7 +142,7 @@ class CloneLabeledMemorysetRequest:
 
         max_seq_length_override = _parse_max_seq_length_override(d.pop("max_seq_length_override", UNSET))
 
-        clone_labeled_memoryset_request = cls(
+        clone_memoryset_request = cls(
             name=name,
             description=description,
             pretrained_embedding_model_name=pretrained_embedding_model_name,
@@ -150,8 +150,8 @@ class CloneLabeledMemorysetRequest:
             max_seq_length_override=max_seq_length_override,
         )
 
-        clone_labeled_memoryset_request.additional_properties = d
-        return clone_labeled_memoryset_request
+        clone_memoryset_request.additional_properties = d
+        return clone_memoryset_request
 
     @property
     def additional_keys(self) -> list[str]:

orca_sdk/_generated_api_client/models/column_info.py

@@ -30,11 +30,13 @@ class ColumnInfo:
         name (str):
         type (ColumnType): The type of a column in a datasource
         enum_options (Union[List[str], None, Unset]):
+        int_values (Union[List[int], None, Unset]):
     """
 
     name: str
     type: ColumnType
     enum_options: Union[List[str], None, Unset] = UNSET
+    int_values: Union[List[int], None, Unset] = UNSET
     additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
@@ -51,6 +53,15 @@ class ColumnInfo:
         else:
             enum_options = self.enum_options
 
+        int_values: Union[List[int], None, Unset]
+        if isinstance(self.int_values, Unset):
+            int_values = UNSET
+        elif isinstance(self.int_values, list):
+            int_values = self.int_values
+
+        else:
+            int_values = self.int_values
+
         field_dict: dict[str, Any] = {}
         field_dict.update(self.additional_properties)
         field_dict.update(
@@ -61,6 +72,8 @@ class ColumnInfo:
         )
         if enum_options is not UNSET:
             field_dict["enum_options"] = enum_options
+        if int_values is not UNSET:
+            field_dict["int_values"] = int_values
 
         return field_dict
 
@@ -88,10 +101,28 @@ class ColumnInfo:
 
         enum_options = _parse_enum_options(d.pop("enum_options", UNSET))
 
+        def _parse_int_values(data: object) -> Union[List[int], None, Unset]:
+            if data is None:
+                return data
+            if isinstance(data, Unset):
+                return data
+            try:
+                if not isinstance(data, list):
+                    raise TypeError()
+                int_values_type_0 = cast(List[int], data)
+
+                return int_values_type_0
+            except:  # noqa: E722
+                pass
+            return cast(Union[List[int], None, Unset], data)
+
+        int_values = _parse_int_values(d.pop("int_values", UNSET))
+
         column_info = cls(
             name=name,
             type=type,
             enum_options=enum_options,
+            int_values=int_values,
         )
 
         column_info.additional_properties = d

orca_sdk/_generated_api_client/models/{create_rac_model_request.py → create_classification_model_request.py}

@@ -18,55 +18,49 @@ from attrs import field as _attrs_field
 from ..models.rac_head_type import RACHeadType
 from ..types import UNSET, Unset
 
-T = TypeVar("T", bound="CreateRACModelRequest")
+T = TypeVar("T", bound="CreateClassificationModelRequest")
 
 
 @_attrs_define
-class CreateRACModelRequest:
+class CreateClassificationModelRequest:
     """
     Attributes:
         name (str):
+        memoryset_id (str):
         description (Union[None, Unset, str]):
-        memoryset_id (Union[None, Unset, str]):
-        memoryset_name (Union[None, Unset, str]):
+        memory_lookup_count (Union[None, Unset, int]):
         head_type (Union[Unset, RACHeadType]):
         weigh_memories (Union[None, Unset, bool]):
         min_memory_weight (Union[None, Unset, float]):
-        memory_lookup_count (Union[None, Unset, int]):
         num_classes (Union[None, Unset, int]):
     """
 
     name: str
+    memoryset_id: str
     description: Union[None, Unset, str] = UNSET
-    memoryset_id: Union[None, Unset, str] = UNSET
-    memoryset_name: Union[None, Unset, str] = UNSET
+    memory_lookup_count: Union[None, Unset, int] = UNSET
     head_type: Union[Unset, RACHeadType] = UNSET
     weigh_memories: Union[None, Unset, bool] = UNSET
     min_memory_weight: Union[None, Unset, float] = UNSET
-    memory_lookup_count: Union[None, Unset, int] = UNSET
     num_classes: Union[None, Unset, int] = UNSET
     additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
         name = self.name
 
+        memoryset_id = self.memoryset_id
+
         description: Union[None, Unset, str]
         if isinstance(self.description, Unset):
             description = UNSET
         else:
             description = self.description
 
-        memoryset_id: Union[None, Unset, str]
-        if isinstance(self.memoryset_id, Unset):
-            memoryset_id = UNSET
-        else:
-            memoryset_id = self.memoryset_id
-
-        memoryset_name: Union[None, Unset, str]
-        if isinstance(self.memoryset_name, Unset):
-            memoryset_name = UNSET
+        memory_lookup_count: Union[None, Unset, int]
+        if isinstance(self.memory_lookup_count, Unset):
+            memory_lookup_count = UNSET
         else:
-            memoryset_name = self.memoryset_name
+            memory_lookup_count = self.memory_lookup_count
 
         head_type: Union[Unset, str] = UNSET
         if not isinstance(self.head_type, Unset):
@@ -84,12 +78,6 @@ class CreateRACModelRequest:
         else:
             min_memory_weight = self.min_memory_weight
 
-        memory_lookup_count: Union[None, Unset, int]
-        if isinstance(self.memory_lookup_count, Unset):
-            memory_lookup_count = UNSET
-        else:
-            memory_lookup_count = self.memory_lookup_count
-
         num_classes: Union[None, Unset, int]
         if isinstance(self.num_classes, Unset):
             num_classes = UNSET
@@ -101,22 +89,19 @@ class CreateRACModelRequest:
         field_dict.update(
             {
                 "name": name,
+                "memoryset_id": memoryset_id,
             }
         )
         if description is not UNSET:
             field_dict["description"] = description
-        if memoryset_id is not UNSET:
-            field_dict["memoryset_id"] = memoryset_id
-        if memoryset_name is not UNSET:
-            field_dict["memoryset_name"] = memoryset_name
+        if memory_lookup_count is not UNSET:
+            field_dict["memory_lookup_count"] = memory_lookup_count
         if head_type is not UNSET:
             field_dict["head_type"] = head_type
         if weigh_memories is not UNSET:
             field_dict["weigh_memories"] = weigh_memories
         if min_memory_weight is not UNSET:
             field_dict["min_memory_weight"] = min_memory_weight
-        if memory_lookup_count is not UNSET:
-            field_dict["memory_lookup_count"] = memory_lookup_count
         if num_classes is not UNSET:
             field_dict["num_classes"] = num_classes
 
@@ -127,6 +112,8 @@ class CreateRACModelRequest:
         d = src_dict.copy()
         name = d.pop("name")
 
+        memoryset_id = d.pop("memoryset_id")
+
         def _parse_description(data: object) -> Union[None, Unset, str]:
             if data is None:
                 return data
@@ -136,23 +123,14 @@ class CreateRACModelRequest:
 
         description = _parse_description(d.pop("description", UNSET))
 
-        def _parse_memoryset_id(data: object) -> Union[None, Unset, str]:
-            if data is None:
-                return data
-            if isinstance(data, Unset):
-                return data
-            return cast(Union[None, Unset, str], data)
-
-        memoryset_id = _parse_memoryset_id(d.pop("memoryset_id", UNSET))
-
-        def _parse_memoryset_name(data: object) -> Union[None, Unset, str]:
+        def _parse_memory_lookup_count(data: object) -> Union[None, Unset, int]:
             if data is None:
                 return data
             if isinstance(data, Unset):
                 return data
-            return cast(Union[None, Unset, str], data)
+            return cast(Union[None, Unset, int], data)
 
-        memoryset_name = _parse_memoryset_name(d.pop("memoryset_name", UNSET))
+        memory_lookup_count = _parse_memory_lookup_count(d.pop("memory_lookup_count", UNSET))
 
         _head_type = d.pop("head_type", UNSET)
         head_type: Union[Unset, RACHeadType]
@@ -179,15 +157,6 @@ class CreateRACModelRequest:
 
         min_memory_weight = _parse_min_memory_weight(d.pop("min_memory_weight", UNSET))
 
-        def _parse_memory_lookup_count(data: object) -> Union[None, Unset, int]:
-            if data is None:
-                return data
-            if isinstance(data, Unset):
-                return data
-            return cast(Union[None, Unset, int], data)
-
-        memory_lookup_count = _parse_memory_lookup_count(d.pop("memory_lookup_count", UNSET))
-
         def _parse_num_classes(data: object) -> Union[None, Unset, int]:
             if data is None:
                 return data
@@ -197,20 +166,19 @@ class CreateRACModelRequest:
 
         num_classes = _parse_num_classes(d.pop("num_classes", UNSET))
 
-        create_rac_model_request = cls(
+        create_classification_model_request = cls(
             name=name,
-            description=description,
             memoryset_id=memoryset_id,
-            memoryset_name=memoryset_name,
+            description=description,
+            memory_lookup_count=memory_lookup_count,
             head_type=head_type,
             weigh_memories=weigh_memories,
             min_memory_weight=min_memory_weight,
-            memory_lookup_count=memory_lookup_count,
             num_classes=num_classes,
         )
 
-        create_rac_model_request.additional_properties = d
-        return create_rac_model_request
+        create_classification_model_request.additional_properties = d
+        return create_classification_model_request
 
     @property
     def additional_keys(self) -> list[str]:

orca_sdk/_generated_api_client/models/{create_labeled_memoryset_request.py → create_memoryset_request.py}

@@ -11,55 +11,62 @@ The main change is:
 # flake8: noqa: C901
 
 from enum import Enum
-from typing import Any, List, Type, TypeVar, Union, cast
+from typing import TYPE_CHECKING, Any, Dict, List, Type, TypeVar, Union, cast
 
 from attrs import define as _attrs_define
 from attrs import field as _attrs_field
 
+from ..models.create_memoryset_request_index_type import CreateMemorysetRequestIndexType
 from ..models.pretrained_embedding_model_name import PretrainedEmbeddingModelName
 from ..types import UNSET, Unset
 
-T = TypeVar("T", bound="CreateLabeledMemorysetRequest")
+if TYPE_CHECKING:
+    from ..models.create_memoryset_request_index_params import CreateMemorysetRequestIndexParams
+
+
+T = TypeVar("T", bound="CreateMemorysetRequest")
 
 
 @_attrs_define
-class CreateLabeledMemorysetRequest:
+class CreateMemorysetRequest:
     """
     Attributes:
         name (str):
-        datasource_label_column (str):
+        datasource_id (str):
         datasource_value_column (str):
         description (Union[None, Unset, str]):
-        datasource_id (Union[None, Unset, str]):
-        datasource_name (Union[None, Unset, str]):
+        datasource_label_column (Union[None, Unset, str]):
+        datasource_score_column (Union[None, Unset, str]):
         datasource_source_id_column (Union[None, Unset, str]):
         remove_duplicates (Union[Unset, bool]):  Default: True.
         pretrained_embedding_model_name (Union[None, PretrainedEmbeddingModelName, Unset]):
         finetuned_embedding_model_id (Union[None, Unset, str]):
-        finetuned_embedding_model_name (Union[None, Unset, str]):
         max_seq_length_override (Union[None, Unset, int]):
         label_names (Union[List[str], None, Unset]):
+        index_type (Union[Unset, CreateMemorysetRequestIndexType]):  Default: CreateMemorysetRequestIndexType.FLAT.
+        index_params (Union[Unset, CreateMemorysetRequestIndexParams]):
     """
 
     name: str
-    datasource_label_column: str
+    datasource_id: str
     datasource_value_column: str
     description: Union[None, Unset, str] = UNSET
-    datasource_id: Union[None, Unset, str] = UNSET
-    datasource_name: Union[None, Unset, str] = UNSET
+    datasource_label_column: Union[None, Unset, str] = UNSET
+    datasource_score_column: Union[None, Unset, str] = UNSET
     datasource_source_id_column: Union[None, Unset, str] = UNSET
     remove_duplicates: Union[Unset, bool] = True
     pretrained_embedding_model_name: Union[None, PretrainedEmbeddingModelName, Unset] = UNSET
     finetuned_embedding_model_id: Union[None, Unset, str] = UNSET
-    finetuned_embedding_model_name: Union[None, Unset, str] = UNSET
     max_seq_length_override: Union[None, Unset, int] = UNSET
     label_names: Union[List[str], None, Unset] = UNSET
+    index_type: Union[Unset, CreateMemorysetRequestIndexType] = CreateMemorysetRequestIndexType.FLAT
+    index_params: Union[Unset, "CreateMemorysetRequestIndexParams"] = UNSET
     additional_properties: dict[str, Any] = _attrs_field(init=False, factory=dict)
 
     def to_dict(self) -> dict[str, Any]:
         name = self.name
 
-        datasource_label_column = self.datasource_label_column
+        datasource_id = self.datasource_id
 
         datasource_value_column = self.datasource_value_column
 
@@ -69,17 +76,17 @@ class CreateLabeledMemorysetRequest:
         else:
             description = self.description
 
-        datasource_id: Union[None, Unset, str]
-        if isinstance(self.datasource_id, Unset):
-            datasource_id = UNSET
+        datasource_label_column: Union[None, Unset, str]
+        if isinstance(self.datasource_label_column, Unset):
+            datasource_label_column = UNSET
         else:
-            datasource_id = self.datasource_id
+            datasource_label_column = self.datasource_label_column
 
-        datasource_name: Union[None, Unset, str]
-        if isinstance(self.datasource_name, Unset):
-            datasource_name = UNSET
+        datasource_score_column: Union[None, Unset, str]
+        if isinstance(self.datasource_score_column, Unset):
+            datasource_score_column = UNSET
         else:
-            datasource_name = self.datasource_name
+            datasource_score_column = self.datasource_score_column
 
         datasource_source_id_column: Union[None, Unset, str]
         if isinstance(self.datasource_source_id_column, Unset):
@@ -107,12 +114,6 @@ class CreateLabeledMemorysetRequest:
         else:
             finetuned_embedding_model_id = self.finetuned_embedding_model_id
 
-        finetuned_embedding_model_name: Union[None, Unset, str]
-        if isinstance(self.finetuned_embedding_model_name, Unset):
-            finetuned_embedding_model_name = UNSET
-        else:
-            finetuned_embedding_model_name = self.finetuned_embedding_model_name
-
         max_seq_length_override: Union[None, Unset, int]
         if isinstance(self.max_seq_length_override, Unset):
             max_seq_length_override = UNSET
@@ -128,21 +129,29 @@ class CreateLabeledMemorysetRequest:
         else:
             label_names = self.label_names
 
+        index_type: Union[Unset, str] = UNSET
+        if not isinstance(self.index_type, Unset):
+            index_type = self.index_type.value
+
+        index_params: Union[Unset, Dict[str, Any]] = UNSET
+        if not isinstance(self.index_params, Unset):
+            index_params = self.index_params.to_dict()
+
         field_dict: dict[str, Any] = {}
         field_dict.update(self.additional_properties)
         field_dict.update(
             {
                 "name": name,
-                "datasource_label_column": datasource_label_column,
+                "datasource_id": datasource_id,
                 "datasource_value_column": datasource_value_column,
             }
         )
         if description is not UNSET:
             field_dict["description"] = description
-        if datasource_id is not UNSET:
-            field_dict["datasource_id"] = datasource_id
-        if datasource_name is not UNSET:
-            field_dict["datasource_name"] = datasource_name
+        if datasource_label_column is not UNSET:
+            field_dict["datasource_label_column"] = datasource_label_column
+        if datasource_score_column is not UNSET:
+            field_dict["datasource_score_column"] = datasource_score_column
         if datasource_source_id_column is not UNSET:
             field_dict["datasource_source_id_column"] = datasource_source_id_column
         if remove_duplicates is not UNSET:
@@ -151,21 +160,25 @@ class CreateLabeledMemorysetRequest:
             field_dict["pretrained_embedding_model_name"] = pretrained_embedding_model_name
         if finetuned_embedding_model_id is not UNSET:
             field_dict["finetuned_embedding_model_id"] = finetuned_embedding_model_id
-        if finetuned_embedding_model_name is not UNSET:
-            field_dict["finetuned_embedding_model_name"] = finetuned_embedding_model_name
         if max_seq_length_override is not UNSET:
             field_dict["max_seq_length_override"] = max_seq_length_override
         if label_names is not UNSET:
             field_dict["label_names"] = label_names
+        if index_type is not UNSET:
+            field_dict["index_type"] = index_type
+        if index_params is not UNSET:
+            field_dict["index_params"] = index_params
 
         return field_dict
 
     @classmethod
     def from_dict(cls: Type[T], src_dict: dict[str, Any]) -> T:
+        from ..models.create_memoryset_request_index_params import CreateMemorysetRequestIndexParams
+
         d = src_dict.copy()
         name = d.pop("name")
 
-        datasource_label_column = d.pop("datasource_label_column")
+        datasource_id = d.pop("datasource_id")
 
         datasource_value_column = d.pop("datasource_value_column")
 
@@ -178,23 +191,23 @@ class CreateLabeledMemorysetRequest:
 
         description = _parse_description(d.pop("description", UNSET))
 
-        def _parse_datasource_id(data: object) -> Union[None, Unset, str]:
+        def _parse_datasource_label_column(data: object) -> Union[None, Unset, str]:
             if data is None:
                 return data
             if isinstance(data, Unset):
                 return data
             return cast(Union[None, Unset, str], data)
 
-        datasource_id = _parse_datasource_id(d.pop("datasource_id", UNSET))
+        datasource_label_column = _parse_datasource_label_column(d.pop("datasource_label_column", UNSET))
 
-        def _parse_datasource_name(data: object) -> Union[None, Unset, str]:
+        def _parse_datasource_score_column(data: object) -> Union[None, Unset, str]:
             if data is None:
                 return data
             if isinstance(data, Unset):
                 return data
             return cast(Union[None, Unset, str], data)
 
-        datasource_name = _parse_datasource_name(d.pop("datasource_name", UNSET))
+        datasource_score_column = _parse_datasource_score_column(d.pop("datasource_score_column", UNSET))
 
         def _parse_datasource_source_id_column(data: object) -> Union[None, Unset, str]:
             if data is None:
@@ -235,17 +248,6 @@ class CreateLabeledMemorysetRequest:
 
         finetuned_embedding_model_id = _parse_finetuned_embedding_model_id(d.pop("finetuned_embedding_model_id", UNSET))
 
-        def _parse_finetuned_embedding_model_name(data: object) -> Union[None, Unset, str]:
-            if data is None:
-                return data
-            if isinstance(data, Unset):
-                return data
-            return cast(Union[None, Unset, str], data)
-
-        finetuned_embedding_model_name = _parse_finetuned_embedding_model_name(
-            d.pop("finetuned_embedding_model_name", UNSET)
-        )
-
         def _parse_max_seq_length_override(data: object) -> Union[None, Unset, int]:
             if data is None:
                 return data
@@ -272,24 +274,39 @@ class CreateLabeledMemorysetRequest:
 
         label_names = _parse_label_names(d.pop("label_names", UNSET))
 
-        create_labeled_memoryset_request = cls(
+        _index_type = d.pop("index_type", UNSET)
+        index_type: Union[Unset, CreateMemorysetRequestIndexType]
+        if isinstance(_index_type, Unset):
+            index_type = UNSET
+        else:
+            index_type = CreateMemorysetRequestIndexType(_index_type)
+
+        _index_params = d.pop("index_params", UNSET)
+        index_params: Union[Unset, CreateMemorysetRequestIndexParams]
+        if isinstance(_index_params, Unset):
+            index_params = UNSET
+        else:
+            index_params = CreateMemorysetRequestIndexParams.from_dict(_index_params)
+
+        create_memoryset_request = cls(
             name=name,
-            datasource_label_column=datasource_label_column,
+            datasource_id=datasource_id,
             datasource_value_column=datasource_value_column,
             description=description,
-            datasource_id=datasource_id,
-            datasource_name=datasource_name,
+            datasource_label_column=datasource_label_column,
+            datasource_score_column=datasource_score_column,
             datasource_source_id_column=datasource_source_id_column,
             remove_duplicates=remove_duplicates,
             pretrained_embedding_model_name=pretrained_embedding_model_name,
             finetuned_embedding_model_id=finetuned_embedding_model_id,
-            finetuned_embedding_model_name=finetuned_embedding_model_name,
             max_seq_length_override=max_seq_length_override,
             label_names=label_names,
+            index_type=index_type,
+            index_params=index_params,
         )
 
-        create_labeled_memoryset_request.additional_properties = d
-        return create_labeled_memoryset_request
+        create_memoryset_request.additional_properties = d
+        return create_memoryset_request
 
     @property
     def additional_keys(self) -> list[str]: