From 3de8ea77ae15795a9b16b256226d16f8f5c7e7cf Mon Sep 17 00:00:00 2001 From: michaelfeil Date: Thu, 3 Oct 2024 09:19:52 -0700 Subject: [PATCH] bump to 0.0.59 --- .../infinity_client/api/default/classify.py | 4 ++ .../infinity_client/api/default/embeddings.py | 4 ++ .../api/default/embeddings_audio.py | 52 ++++++++++++++++--- .../api/default/embeddings_image.py | 48 ++++++++++++++--- .../infinity_client/api/default/rerank.py | 4 ++ .../models/audio_embedding_input.py | 17 +++++- .../models/image_embedding_input.py | 17 +++++- .../infinity_client/models/rerank_input.py | 9 ++++ .../infinity_client/pyproject.toml | 2 +- libs/infinity_emb/pyproject.toml | 2 +- 10 files changed, 137 insertions(+), 22 deletions(-) diff --git a/libs/client_infinity/infinity_client/infinity_client/api/default/classify.py b/libs/client_infinity/infinity_client/infinity_client/api/default/classify.py index a4f950c7..b1cc0e2e 100644 --- a/libs/client_infinity/infinity_client/infinity_client/api/default/classify.py +++ b/libs/client_infinity/infinity_client/infinity_client/api/default/classify.py @@ -73,6 +73,7 @@ def sync_detailed( requests.post(\"http://..:7997/classify\", json={\"model\":\"SamLowe/roberta-base-go_emotions\",\"input\":[\"I am not having a great day.\"]}) + ``` Args: body (ClassifyInput): @@ -110,6 +111,7 @@ def sync( requests.post(\"http://..:7997/classify\", json={\"model\":\"SamLowe/roberta-base-go_emotions\",\"input\":[\"I am not having a great day.\"]}) + ``` Args: body (ClassifyInput): @@ -142,6 +144,7 @@ async def asyncio_detailed( requests.post(\"http://..:7997/classify\", json={\"model\":\"SamLowe/roberta-base-go_emotions\",\"input\":[\"I am not having a great day.\"]}) + ``` Args: body (ClassifyInput): @@ -177,6 +180,7 @@ async def asyncio( requests.post(\"http://..:7997/classify\", json={\"model\":\"SamLowe/roberta-base-go_emotions\",\"input\":[\"I am not having a great day.\"]}) + ``` Args: body (ClassifyInput): diff --git a/libs/client_infinity/infinity_client/infinity_client/api/default/embeddings.py b/libs/client_infinity/infinity_client/infinity_client/api/default/embeddings.py index 057c9167..d1e9e995 100644 --- a/libs/client_infinity/infinity_client/infinity_client/api/default/embeddings.py +++ b/libs/client_infinity/infinity_client/infinity_client/api/default/embeddings.py @@ -72,6 +72,7 @@ def sync_detailed( import requests requests.post(\"http://..:7997/embeddings\", json={\"model\":\"BAAI/bge-small-en-v1.5\",\"input\":[\"A sentence to encode.\"]}) + ``` Args: body (OpenAIEmbeddingInput): @@ -108,6 +109,7 @@ def sync( import requests requests.post(\"http://..:7997/embeddings\", json={\"model\":\"BAAI/bge-small-en-v1.5\",\"input\":[\"A sentence to encode.\"]}) + ``` Args: body (OpenAIEmbeddingInput): @@ -139,6 +141,7 @@ async def asyncio_detailed( import requests requests.post(\"http://..:7997/embeddings\", json={\"model\":\"BAAI/bge-small-en-v1.5\",\"input\":[\"A sentence to encode.\"]}) + ``` Args: body (OpenAIEmbeddingInput): @@ -173,6 +176,7 @@ async def asyncio( import requests requests.post(\"http://..:7997/embeddings\", json={\"model\":\"BAAI/bge-small-en-v1.5\",\"input\":[\"A sentence to encode.\"]}) + ``` Args: body (OpenAIEmbeddingInput): diff --git a/libs/client_infinity/infinity_client/infinity_client/api/default/embeddings_audio.py b/libs/client_infinity/infinity_client/infinity_client/api/default/embeddings_audio.py index b7c6e2cf..95e8ed0e 100644 --- a/libs/client_infinity/infinity_client/infinity_client/api/default/embeddings_audio.py +++ b/libs/client_infinity/infinity_client/infinity_client/api/default/embeddings_audio.py @@ -68,11 +68,20 @@ def sync_detailed( Encode Embeddings from Audio files + Supports URLs of Audios and Base64-encoded Audios + ```python import requests requests.post(\"http://..:7997/embeddings_audio\", - json={\"model\":\"laion/larger_clap_general\",\"input\":[\"https://github.com/michaelfeil/infini - ty/raw/3b72eb7c14bae06e68ddd07c1f23fe0bf403f220/libs/infinity_emb/tests/data/audio/beep.wav\"]}) + json={ + \"model\":\"laion/larger_clap_general\", + \"input\": [ + \"https://github.com/michaelfeil/infinity/raw/3b72eb7c14bae06e68ddd07c1f23fe0bf403f220/l + ibs/infinity_emb/tests/data/audio/beep.wav\", + \"data:audio/wav;base64,iVBORw0KGgoDEMOoSAMPLEoENCODEDAUDIO\" + ] + }) + ``` Args: body (AudioEmbeddingInput): @@ -105,11 +114,20 @@ def sync( Encode Embeddings from Audio files + Supports URLs of Audios and Base64-encoded Audios + ```python import requests requests.post(\"http://..:7997/embeddings_audio\", - json={\"model\":\"laion/larger_clap_general\",\"input\":[\"https://github.com/michaelfeil/infini - ty/raw/3b72eb7c14bae06e68ddd07c1f23fe0bf403f220/libs/infinity_emb/tests/data/audio/beep.wav\"]}) + json={ + \"model\":\"laion/larger_clap_general\", + \"input\": [ + \"https://github.com/michaelfeil/infinity/raw/3b72eb7c14bae06e68ddd07c1f23fe0bf403f220/l + ibs/infinity_emb/tests/data/audio/beep.wav\", + \"data:audio/wav;base64,iVBORw0KGgoDEMOoSAMPLEoENCODEDAUDIO\" + ] + }) + ``` Args: body (AudioEmbeddingInput): @@ -137,11 +155,20 @@ async def asyncio_detailed( Encode Embeddings from Audio files + Supports URLs of Audios and Base64-encoded Audios + ```python import requests requests.post(\"http://..:7997/embeddings_audio\", - json={\"model\":\"laion/larger_clap_general\",\"input\":[\"https://github.com/michaelfeil/infini - ty/raw/3b72eb7c14bae06e68ddd07c1f23fe0bf403f220/libs/infinity_emb/tests/data/audio/beep.wav\"]}) + json={ + \"model\":\"laion/larger_clap_general\", + \"input\": [ + \"https://github.com/michaelfeil/infinity/raw/3b72eb7c14bae06e68ddd07c1f23fe0bf403f220/l + ibs/infinity_emb/tests/data/audio/beep.wav\", + \"data:audio/wav;base64,iVBORw0KGgoDEMOoSAMPLEoENCODEDAUDIO\" + ] + }) + ``` Args: body (AudioEmbeddingInput): @@ -172,11 +199,20 @@ async def asyncio( Encode Embeddings from Audio files + Supports URLs of Audios and Base64-encoded Audios + ```python import requests requests.post(\"http://..:7997/embeddings_audio\", - json={\"model\":\"laion/larger_clap_general\",\"input\":[\"https://github.com/michaelfeil/infini - ty/raw/3b72eb7c14bae06e68ddd07c1f23fe0bf403f220/libs/infinity_emb/tests/data/audio/beep.wav\"]}) + json={ + \"model\":\"laion/larger_clap_general\", + \"input\": [ + \"https://github.com/michaelfeil/infinity/raw/3b72eb7c14bae06e68ddd07c1f23fe0bf403f220/l + ibs/infinity_emb/tests/data/audio/beep.wav\", + \"data:audio/wav;base64,iVBORw0KGgoDEMOoSAMPLEoENCODEDAUDIO\" + ] + }) + ``` Args: body (AudioEmbeddingInput): diff --git a/libs/client_infinity/infinity_client/infinity_client/api/default/embeddings_image.py b/libs/client_infinity/infinity_client/infinity_client/api/default/embeddings_image.py index 189639b8..71f36ad7 100644 --- a/libs/client_infinity/infinity_client/infinity_client/api/default/embeddings_image.py +++ b/libs/client_infinity/infinity_client/infinity_client/api/default/embeddings_image.py @@ -68,11 +68,19 @@ def sync_detailed( Encode Embeddings from Image files + Supports URLs of Images and Base64-encoded Images + ```python import requests requests.post(\"http://..:7997/embeddings_image\", - json={\"model\":\"openai/clip-vit-base- - patch32\",\"input\":[\"http://images.cocodataset.org/val2017/000000039769.jpg\"]}) + json={ + \"model\":\"openai/clip-vit-base-patch32\", + \"input\": [ + \"http://images.cocodataset.org/val2017/000000039769.jpg\", + \"data:image/png;base64,iVBORw0KGgoDEMOoSAMPLEoENCODEDIMAGE\" + ] + }) + ``` Args: body (ImageEmbeddingInput): @@ -105,11 +113,19 @@ def sync( Encode Embeddings from Image files + Supports URLs of Images and Base64-encoded Images + ```python import requests requests.post(\"http://..:7997/embeddings_image\", - json={\"model\":\"openai/clip-vit-base- - patch32\",\"input\":[\"http://images.cocodataset.org/val2017/000000039769.jpg\"]}) + json={ + \"model\":\"openai/clip-vit-base-patch32\", + \"input\": [ + \"http://images.cocodataset.org/val2017/000000039769.jpg\", + \"data:image/png;base64,iVBORw0KGgoDEMOoSAMPLEoENCODEDIMAGE\" + ] + }) + ``` Args: body (ImageEmbeddingInput): @@ -137,11 +153,19 @@ async def asyncio_detailed( Encode Embeddings from Image files + Supports URLs of Images and Base64-encoded Images + ```python import requests requests.post(\"http://..:7997/embeddings_image\", - json={\"model\":\"openai/clip-vit-base- - patch32\",\"input\":[\"http://images.cocodataset.org/val2017/000000039769.jpg\"]}) + json={ + \"model\":\"openai/clip-vit-base-patch32\", + \"input\": [ + \"http://images.cocodataset.org/val2017/000000039769.jpg\", + \"data:image/png;base64,iVBORw0KGgoDEMOoSAMPLEoENCODEDIMAGE\" + ] + }) + ``` Args: body (ImageEmbeddingInput): @@ -172,11 +196,19 @@ async def asyncio( Encode Embeddings from Image files + Supports URLs of Images and Base64-encoded Images + ```python import requests requests.post(\"http://..:7997/embeddings_image\", - json={\"model\":\"openai/clip-vit-base- - patch32\",\"input\":[\"http://images.cocodataset.org/val2017/000000039769.jpg\"]}) + json={ + \"model\":\"openai/clip-vit-base-patch32\", + \"input\": [ + \"http://images.cocodataset.org/val2017/000000039769.jpg\", + \"data:image/png;base64,iVBORw0KGgoDEMOoSAMPLEoENCODEDIMAGE\" + ] + }) + ``` Args: body (ImageEmbeddingInput): diff --git a/libs/client_infinity/infinity_client/infinity_client/api/default/rerank.py b/libs/client_infinity/infinity_client/infinity_client/api/default/rerank.py index d26186c5..6eadbe5f 100644 --- a/libs/client_infinity/infinity_client/infinity_client/api/default/rerank.py +++ b/libs/client_infinity/infinity_client/infinity_client/api/default/rerank.py @@ -76,6 +76,7 @@ def sync_detailed( \"query\":\"Where is Munich?\", \"documents\":[\"Munich is in Germany.\", \"The sky is blue.\"] }) + ``` Args: body (RerankInput): Input for reranking @@ -116,6 +117,7 @@ def sync( \"query\":\"Where is Munich?\", \"documents\":[\"Munich is in Germany.\", \"The sky is blue.\"] }) + ``` Args: body (RerankInput): Input for reranking @@ -151,6 +153,7 @@ async def asyncio_detailed( \"query\":\"Where is Munich?\", \"documents\":[\"Munich is in Germany.\", \"The sky is blue.\"] }) + ``` Args: body (RerankInput): Input for reranking @@ -189,6 +192,7 @@ async def asyncio( \"query\":\"Where is Munich?\", \"documents\":[\"Munich is in Germany.\", \"The sky is blue.\"] }) + ``` Args: body (RerankInput): Input for reranking diff --git a/libs/client_infinity/infinity_client/infinity_client/models/audio_embedding_input.py b/libs/client_infinity/infinity_client/infinity_client/models/audio_embedding_input.py index 860cf63f..d4f6d247 100644 --- a/libs/client_infinity/infinity_client/infinity_client/models/audio_embedding_input.py +++ b/libs/client_infinity/infinity_client/infinity_client/models/audio_embedding_input.py @@ -28,7 +28,11 @@ class AudioEmbeddingInput: def to_dict(self) -> Dict[str, Any]: input_: Union[List[str], str] if isinstance(self.input_, list): - input_ = self.input_ + input_ = [] + for input_type_0_item_data in self.input_: + input_type_0_item: str + input_type_0_item = input_type_0_item_data + input_.append(input_type_0_item) else: input_ = self.input_ @@ -69,7 +73,16 @@ def _parse_input_(data: object) -> Union[List[str], str]: try: if not isinstance(data, list): raise TypeError() - input_type_0 = cast(List[str], data) + input_type_0 = [] + _input_type_0 = data + for input_type_0_item_data in _input_type_0: + + def _parse_input_type_0_item(data: object) -> str: + return cast(str, data) + + input_type_0_item = _parse_input_type_0_item(input_type_0_item_data) + + input_type_0.append(input_type_0_item) return input_type_0 except: # noqa: E722 diff --git a/libs/client_infinity/infinity_client/infinity_client/models/image_embedding_input.py b/libs/client_infinity/infinity_client/infinity_client/models/image_embedding_input.py index 6cb48087..a75a5801 100644 --- a/libs/client_infinity/infinity_client/infinity_client/models/image_embedding_input.py +++ b/libs/client_infinity/infinity_client/infinity_client/models/image_embedding_input.py @@ -28,7 +28,11 @@ class ImageEmbeddingInput: def to_dict(self) -> Dict[str, Any]: input_: Union[List[str], str] if isinstance(self.input_, list): - input_ = self.input_ + input_ = [] + for input_type_0_item_data in self.input_: + input_type_0_item: str + input_type_0_item = input_type_0_item_data + input_.append(input_type_0_item) else: input_ = self.input_ @@ -69,7 +73,16 @@ def _parse_input_(data: object) -> Union[List[str], str]: try: if not isinstance(data, list): raise TypeError() - input_type_0 = cast(List[str], data) + input_type_0 = [] + _input_type_0 = data + for input_type_0_item_data in _input_type_0: + + def _parse_input_type_0_item(data: object) -> str: + return cast(str, data) + + input_type_0_item = _parse_input_type_0_item(input_type_0_item_data) + + input_type_0.append(input_type_0_item) return input_type_0 except: # noqa: E722 diff --git a/libs/client_infinity/infinity_client/infinity_client/models/rerank_input.py b/libs/client_infinity/infinity_client/infinity_client/models/rerank_input.py index c49bb987..b332229f 100644 --- a/libs/client_infinity/infinity_client/infinity_client/models/rerank_input.py +++ b/libs/client_infinity/infinity_client/infinity_client/models/rerank_input.py @@ -16,12 +16,14 @@ class RerankInput: query (str): documents (List[str]): return_documents (Union[Unset, bool]): Default: False. + raw_scores (Union[Unset, bool]): Default: False. model (Union[Unset, str]): Default: 'default/not-specified'. """ query: str documents: List[str] return_documents: Union[Unset, bool] = False + raw_scores: Union[Unset, bool] = False model: Union[Unset, str] = "default/not-specified" additional_properties: Dict[str, Any] = _attrs_field(init=False, factory=dict) @@ -32,6 +34,8 @@ def to_dict(self) -> Dict[str, Any]: return_documents = self.return_documents + raw_scores = self.raw_scores + model = self.model field_dict: Dict[str, Any] = {} @@ -44,6 +48,8 @@ def to_dict(self) -> Dict[str, Any]: ) if return_documents is not UNSET: field_dict["return_documents"] = return_documents + if raw_scores is not UNSET: + field_dict["raw_scores"] = raw_scores if model is not UNSET: field_dict["model"] = model @@ -58,12 +64,15 @@ def from_dict(cls: Type[T], src_dict: Dict[str, Any]) -> T: return_documents = d.pop("return_documents", UNSET) + raw_scores = d.pop("raw_scores", UNSET) + model = d.pop("model", UNSET) rerank_input = cls( query=query, documents=documents, return_documents=return_documents, + raw_scores=raw_scores, model=model, ) diff --git a/libs/client_infinity/infinity_client/pyproject.toml b/libs/client_infinity/infinity_client/pyproject.toml index 46e56b77..2952170b 100644 --- a/libs/client_infinity/infinity_client/pyproject.toml +++ b/libs/client_infinity/infinity_client/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "infinity_client" -version = "0.0.58" +version = "0.0.59" description = "A client library for accessing ♾️ Infinity - Embedding Inference Server" authors = [] readme = "README.md" diff --git a/libs/infinity_emb/pyproject.toml b/libs/infinity_emb/pyproject.toml index 7ab32bf4..55d9b61d 100644 --- a/libs/infinity_emb/pyproject.toml +++ b/libs/infinity_emb/pyproject.toml @@ -1,6 +1,6 @@ [tool.poetry] name = "infinity_emb" -version = "0.0.58" +version = "0.0.59" description = "Infinity is a high-throughput, low-latency REST API for serving text-embeddings, reranking models and clip." authors = ["michaelfeil "] license = "MIT"