Skip to content

Commit

Permalink
multimodal model support
Browse files Browse the repository at this point in the history
  • Loading branch information
RaynorChavez committed Aug 21, 2024
1 parent 68c853a commit c0fafbd
Show file tree
Hide file tree
Showing 4 changed files with 12 additions and 2 deletions.
2 changes: 1 addition & 1 deletion setup.py
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
"tox"
],
name="marqo",
version="3.7.0",
version="3.8.0",
author="marqo org",
author_email="org@marqo.io",
description="Tensor search for humans",
Expand Down
3 changes: 3 additions & 0 deletions src/marqo/client.py
Original file line number Diff line number Diff line change
Expand Up @@ -69,6 +69,7 @@ def create_index(
type: Optional[marqo_index.IndexType] = None,
settings_dict: Optional[Dict[str, Any]] = None,
treat_urls_and_pointers_as_images: Optional[bool] = None,
treat_urls_and_pointers_as_media: Optional[bool] = None,
filter_string_max_length: Optional[int] = None,
all_fields: Optional[List[marqo_index.FieldRequest]] = None,
tensor_fields: Optional[List[str]] = None,
Expand Down Expand Up @@ -100,6 +101,7 @@ def create_index(
parameters, and is passed directly as the index's
index_settings
treat_urls_and_pointers_as_images: whether to treat urls and pointers as images
treat_urls_and_pointers_as_media: whether to treat urls and pointers as media (video/audio)
filter_string_max_length: threshold for short string length in unstructured indexes,
Marqo can filter on short strings but can not filter on long strings
all_fields: list of all the fields in the structured index
Expand Down Expand Up @@ -132,6 +134,7 @@ def create_index(
config=self.config, index_name=index_name,
type=type, settings_dict=settings_dict,
treat_urls_and_pointers_as_images=treat_urls_and_pointers_as_images,
treat_urls_and_pointers_as_media=treat_urls_and_pointers_as_media,
filter_string_max_length=filter_string_max_length,
all_fields=all_fields, tensor_fields=tensor_fields,
model=model, model_properties=model_properties,
Expand Down
4 changes: 4 additions & 0 deletions src/marqo/index.py
Original file line number Diff line number Diff line change
Expand Up @@ -80,6 +80,7 @@ def create(config: Config,
type: Optional[marqo_index.IndexType] = None,
settings_dict: Optional[Dict[str, Any]] = None,
treat_urls_and_pointers_as_images: Optional[bool] = None,
treat_urls_and_pointers_as_media: Optional[bool] = None,
filter_string_max_length: Optional[int] = None,
all_fields: Optional[List[marqo_index.FieldRequest]] = None,
tensor_fields: Optional[List[str]] = None,
Expand Down Expand Up @@ -114,6 +115,7 @@ def create(config: Config,
parameters, and is passed directly as the index's
index_settings
treat_urls_and_pointers_as_images: whether to treat urls and pointers as images in unstructured indexes
treat_urls_and_pointers_as_media: whether to treat urls and pointers as media (video/audio) in unstructured indexes
filter_string_max_length: threshold for short string length in unstructured indexes,
Marqo can filter on short strings but can not filter on long strings
all_fields: list of fields in the structured index
Expand Down Expand Up @@ -148,6 +150,7 @@ def create(config: Config,
allFields=all_fields,
settingsDict=settings_dict,
treatUrlsAndPointersAsImages=treat_urls_and_pointers_as_images,
treatUrlsAndPointersAsMedia=treat_urls_and_pointers_as_media,
filterStringMaxLength=filter_string_max_length,
tensorFields=tensor_fields,
model=model,
Expand All @@ -170,6 +173,7 @@ def create(config: Config,
allFields=all_fields,
settingsDict=settings_dict,
treatUrlsAndPointersAsImages=treat_urls_and_pointers_as_images,
treatUrlsAndPointersAsMedia=treat_urls_and_pointers_as_media,
filterStringMaxLength=filter_string_max_length,
tensorFields=tensor_fields,
model=model,
Expand Down
5 changes: 4 additions & 1 deletion src/marqo/models/create_index_settings.py
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,9 @@ class IndexSettings(MarqoBaseModel):
Can not be specified with other parameters.
tensorFields: A list of all tensor fields in the index.
treatUrlsAndPointersAsImages: Whether to treat urls and pointers as images.
This unstructured index only parameter.
This is and unstructured index only parameter.
treatUrlsAndPointersAsMedia: Whether to treat urls and pointers as media (video/audio).
This is an unstructured index only parameter.
filterStringMaxLength: The max length of the filter string in unstructured index
model: The name of the model to use for the index.
modelProperties: A dictionary of model properties.
Expand All @@ -34,6 +36,7 @@ class IndexSettings(MarqoBaseModel):
settingsDict: Optional[Dict] = None
tensorFields: Optional[List[str]] = None
treatUrlsAndPointersAsImages: Optional[bool] = None
treatUrlsAndPointersAsMedia: Optional[bool] = None
filterStringMaxLength: Optional[int] = None
model: Optional[str] = None
modelProperties: Optional[Dict[str, Any]] = None
Expand Down

0 comments on commit c0fafbd

Please sign in to comment.