unstructured-ingest 1.0.15__tar.gz → 1.0.17__tar.gz

{unstructured_ingest-1.0.15 → unstructured_ingest-1.0.17}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: unstructured_ingest
-Version: 1.0.15
+Version: 1.0.17
 Summary: Local ETL data pipeline to get data RAG ready
 Author-email: Unstructured Technologies <devops@unstructuredai.io>
 License-Expression: Apache-2.0
@@ -19,7 +19,6 @@ Classifier: Programming Language :: Python :: 3.12
 Classifier: Topic :: Scientific/Engineering :: Artificial Intelligence
 Requires-Python: <3.13,>=3.9
 Requires-Dist: click
-Requires-Dist: dataclasses-json
 Requires-Dist: opentelemetry-sdk
 Requires-Dist: pydantic>=2.7
 Requires-Dist: python-dateutil
@@ -74,7 +73,7 @@ Provides-Extra: duckdb
 Requires-Dist: duckdb; extra == 'duckdb'
 Requires-Dist: pandas; extra == 'duckdb'
 Provides-Extra: elasticsearch
-Requires-Dist: elasticsearch[async]; extra == 'elasticsearch'
+Requires-Dist: elasticsearch[async]<9.0.0; extra == 'elasticsearch'
 Provides-Extra: epub
 Requires-Dist: unstructured[epub]; extra == 'epub'
 Provides-Extra: gcs

unstructured_ingest-1.0.17/unstructured_ingest/__version__.py

@@ -0,0 +1 @@
+__version__ = "1.0.17"  # pragma: no cover

{unstructured_ingest-1.0.15 → unstructured_ingest-1.0.17}/unstructured_ingest/embed/azure_openai.py

@@ -16,15 +16,18 @@ if TYPE_CHECKING:
 
 class AzureOpenAIEmbeddingConfig(OpenAIEmbeddingConfig):
     api_version: str = Field(description="Azure API version", default="2024-06-01")
-    azure_endpoint: str
-    embedder_model_name: str = Field(default="text-embedding-ada-002", alias="model_name")
+    azure_endpoint: str = Field(description="Azure endpoint")
+    embedder_model_name: str = Field(
+        default="text-embedding-ada-002", alias="model_name", description="Azure OpenAI model name"
+    )
 
     @requires_dependencies(["openai"], extras="openai")
     def get_client(self) -> "AzureOpenAI":
         from openai import AzureOpenAI
 
+        api_key = self.api_key.get_secret_value() if self.api_key else None
         return AzureOpenAI(
-            api_key=self.api_key.get_secret_value(),
+            api_key=api_key,
             api_version=self.api_version,
             azure_endpoint=self.azure_endpoint,
         )
@@ -33,8 +36,9 @@ class AzureOpenAIEmbeddingConfig(OpenAIEmbeddingConfig):
     def get_async_client(self) -> "AsyncAzureOpenAI":
         from openai import AsyncAzureOpenAI
 
+        api_key = self.api_key.get_secret_value() if self.api_key else None
         return AsyncAzureOpenAI(
-            api_key=self.api_key.get_secret_value(),
+            api_key=api_key,
             api_version=self.api_version,
             azure_endpoint=self.azure_endpoint,
         )

{unstructured_ingest-1.0.15 → unstructured_ingest-1.0.17}/unstructured_ingest/embed/bedrock.py

@@ -58,10 +58,14 @@ def conform_query(query: str, provider: str) -> dict:
 
 
 class BedrockEmbeddingConfig(EmbeddingConfig):
-    aws_access_key_id: SecretStr
-    aws_secret_access_key: SecretStr
-    region_name: str = "us-west-2"
-    embedder_model_name: str = Field(default="amazon.titan-embed-text-v1", alias="model_name")
+    aws_access_key_id: SecretStr = Field(description="aws access key id")
+    aws_secret_access_key: SecretStr = Field(description="aws secret access key")
+    region_name: str = Field(description="aws region name", default="us-west-2")
+    embedder_model_name: str = Field(
+        default="amazon.titan-embed-text-v1",
+        alias="model_name",
+        description="AWS Bedrock model name",
+    )
 
     def wrap_error(self, e: Exception) -> Exception:
         if is_internal_error(e=e):

{unstructured_ingest-1.0.15 → unstructured_ingest-1.0.17}/unstructured_ingest/embed/huggingface.py

@@ -15,11 +15,18 @@ if TYPE_CHECKING:
 
 
 class HuggingFaceEmbeddingConfig(EmbeddingConfig):
-    embedder_model_name: Optional[str] = Field(default="all-MiniLM-L6-v2", alias="model_name")
+    embedder_model_name: Optional[str] = Field(
+        default="all-MiniLM-L6-v2", alias="model_name", description="HuggingFace model name"
+    )
     embedder_model_kwargs: Optional[dict] = Field(
-        default_factory=lambda: {"device": "cpu"}, alias="model_kwargs"
+        default_factory=lambda: {"device": "cpu"},
+        alias="model_kwargs",
+        description="additional model parameters",
+    )
+    encode_kwargs: Optional[dict] = Field(
+        default_factory=lambda: {"normalize_embeddings": False},
+        description="additional embedding parameters",
     )
-    encode_kwargs: Optional[dict] = Field(default_factory=lambda: {"normalize_embeddings": False})
 
     @requires_dependencies(
         ["sentence_transformers"],

{unstructured_ingest-1.0.15 → unstructured_ingest-1.0.17}/unstructured_ingest/embed/mixedbreadai.py

@@ -34,10 +34,13 @@ class MixedbreadAIEmbeddingConfig(EmbeddingConfig):
 
     api_key: SecretStr = Field(
         default_factory=lambda: SecretStr(os.environ.get("MXBAI_API_KEY")),
+        description="API key for Mixedbread AI",
     )
 
     embedder_model_name: str = Field(
-        default="mixedbread-ai/mxbai-embed-large-v1", alias="model_name"
+        default="mixedbread-ai/mxbai-embed-large-v1",
+        alias="model_name",
+        description="Mixedbread AI model name",
     )
 
     @requires_dependencies(

{unstructured_ingest-1.0.15 → unstructured_ingest-1.0.17}/unstructured_ingest/embed/octoai.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import TYPE_CHECKING
+from typing import TYPE_CHECKING, Optional
 
 from pydantic import Field, SecretStr
 
@@ -24,9 +24,13 @@ if TYPE_CHECKING:
 
 
 class OctoAiEmbeddingConfig(EmbeddingConfig):
-    api_key: SecretStr
-    embedder_model_name: str = Field(default="thenlper/gte-large", alias="model_name")
-    base_url: str = Field(default="https://text.octoai.run/v1")
+    api_key: Optional[SecretStr] = Field(description="API key for OctoAI", default=None)
+    embedder_model_name: str = Field(
+        default="thenlper/gte-large", alias="model_name", description="octoai model name"
+    )
+    base_url: str = Field(
+        default="https://text.octoai.run/v1", description="optional override for the base url"
+    )
 
     def wrap_error(self, e: Exception) -> Exception:
         if is_internal_error(e=e):
@@ -73,7 +77,8 @@ class OctoAiEmbeddingConfig(EmbeddingConfig):
         """Creates an OpenAI python client to embed elements. Uses the OpenAI SDK."""
         from openai import OpenAI
 
-        return OpenAI(api_key=self.api_key.get_secret_value(), base_url=self.base_url)
+        api_key = self.api_key.get_secret_value() if self.api_key else None
+        return OpenAI(api_key=api_key, base_url=self.base_url)
 
     @requires_dependencies(
         ["openai", "tiktoken"],
@@ -83,7 +88,8 @@ class OctoAiEmbeddingConfig(EmbeddingConfig):
         """Creates an OpenAI python client to embed elements. Uses the OpenAI SDK."""
         from openai import AsyncOpenAI
 
-        return AsyncOpenAI(api_key=self.api_key.get_secret_value(), base_url=self.base_url)
+        api_key = self.api_key.get_secret_value() if self.api_key else None
+        return AsyncOpenAI(api_key=api_key, base_url=self.base_url)
 
 
 @dataclass

{unstructured_ingest-1.0.15 → unstructured_ingest-1.0.17}/unstructured_ingest/embed/openai.py

@@ -24,9 +24,11 @@ if TYPE_CHECKING:
 
 
 class OpenAIEmbeddingConfig(EmbeddingConfig):
-    api_key: SecretStr
-    embedder_model_name: str = Field(default="text-embedding-ada-002", alias="model_name")
-    base_url: Optional[str] = None
+    api_key: Optional[SecretStr] = Field(description="API key for OpenAI", default=None)
+    embedder_model_name: str = Field(
+        default="text-embedding-ada-002", alias="model_name", description="OpenAI model name"
+    )
+    base_url: Optional[str] = Field(default=None, description="optional override for the base url")
 
     @requires_dependencies(["openai"], extras="openai")
     def wrap_error(self, e: Exception) -> Exception:
@@ -86,13 +88,15 @@ class OpenAIEmbeddingConfig(EmbeddingConfig):
     def get_client(self) -> "OpenAI":
         from openai import OpenAI
 
-        return OpenAI(api_key=self.api_key.get_secret_value(), base_url=self.base_url)
+        api_key = self.api_key.get_secret_value() if self.api_key else None
+        return OpenAI(api_key=api_key, base_url=self.base_url)
 
     @requires_dependencies(["openai"], extras="openai")
     def get_async_client(self) -> "AsyncOpenAI":
         from openai import AsyncOpenAI
 
-        return AsyncOpenAI(api_key=self.api_key.get_secret_value(), base_url=self.base_url)
+        api_key = self.api_key.get_secret_value() if self.api_key else None
+        return AsyncOpenAI(api_key=api_key, base_url=self.base_url)
 
 
 @dataclass

{unstructured_ingest-1.0.15 → unstructured_ingest-1.0.17}/unstructured_ingest/embed/togetherai.py

@@ -1,5 +1,5 @@
 from dataclasses import dataclass
-from typing import TYPE_CHECKING, Any
+from typing import TYPE_CHECKING, Any, Optional
 
 from pydantic import Field, SecretStr
 
@@ -20,9 +20,11 @@ if TYPE_CHECKING:
 
 
 class TogetherAIEmbeddingConfig(EmbeddingConfig):
-    api_key: SecretStr
+    api_key: Optional[SecretStr] = Field(description="API key for Together AI", default=None)
     embedder_model_name: str = Field(
-        default="togethercomputer/m2-bert-80M-8k-retrieval", alias="model_name"
+        default="togethercomputer/m2-bert-80M-8k-retrieval",
+        alias="model_name",
+        description="Together AI model name",
     )
 
     def wrap_error(self, e: Exception) -> Exception:
@@ -56,13 +58,15 @@ class TogetherAIEmbeddingConfig(EmbeddingConfig):
     def get_client(self) -> "Together":
         from together import Together
 
-        return Together(api_key=self.api_key.get_secret_value())
+        api_key = self.api_key.get_secret_value() if self.api_key else None
+        return Together(api_key=api_key)
 
     @requires_dependencies(["together"], extras="togetherai")
     def get_async_client(self) -> "AsyncTogether":
         from together import AsyncTogether
 
-        return AsyncTogether(api_key=self.api_key.get_secret_value())
+        api_key = self.api_key.get_secret_value() if self.api_key else None
+        return AsyncTogether(api_key=api_key)
 
 
 @dataclass

{unstructured_ingest-1.0.15 → unstructured_ingest-1.0.17}/unstructured_ingest/embed/vertexai.py

@@ -32,9 +32,9 @@ ApiKeyType = Secret[Annotated[dict, BeforeValidator(conform_string_to_dict)]]
 
 
 class VertexAIEmbeddingConfig(EmbeddingConfig):
-    api_key: ApiKeyType
+    api_key: ApiKeyType = Field(description="API key for Vertex AI")
     embedder_model_name: Optional[str] = Field(
-        default="textembedding-gecko@001", alias="model_name"
+        default="textembedding-gecko@001", alias="model_name", description="Vertex AI model name"
     )
 
     def wrap_error(self, e: Exception) -> Exception:

{unstructured_ingest-1.0.15 → unstructured_ingest-1.0.17}/unstructured_ingest/embed/voyageai.py

@@ -26,11 +26,14 @@ class VoyageAIEmbeddingConfig(EmbeddingConfig):
         le=128,
         description="Batch size for embedding requests. VoyageAI has a limit of 128.",
     )
-    api_key: SecretStr
-    embedder_model_name: str = Field(default="voyage-3", alias="model_name")
-    truncation: Optional[bool] = Field(default=None)
-    max_retries: int = 0
-    timeout_in_seconds: Optional[int] = None
+    api_key: Optional[SecretStr] = Field(description="API key for VoyageAI", default=None)
+    embedder_model_name: str = Field(
+        default="voyage-3", alias="model_name", description="VoyageAI model name"
+    )
+    max_retries: int = Field(default=0, description="Max retries for embedding requests.")
+    timeout_in_seconds: Optional[int] = Field(
+        default=None, description="Optional timeout in seconds for embedding requests."
+    )
 
     def wrap_error(self, e: Exception) -> Exception:
         if is_internal_error(e=e):
@@ -62,8 +65,9 @@ class VoyageAIEmbeddingConfig(EmbeddingConfig):
         """Creates a VoyageAI python client to embed elements."""
         from voyageai import Client as VoyageAIClient
 
+        api_key = self.api_key.get_secret_value() if self.api_key else None
         client = VoyageAIClient(
-            api_key=self.api_key.get_secret_value(),
+            api_key=api_key,
             max_retries=self.max_retries,
             timeout=self.timeout_in_seconds,
         )
@@ -77,8 +81,9 @@ class VoyageAIEmbeddingConfig(EmbeddingConfig):
         """Creates a VoyageAI python client to embed elements."""
         from voyageai import AsyncClient as AsyncVoyageAIClient
 
+        api_key = self.api_key.get_secret_value() if self.api_key else None
         client = AsyncVoyageAIClient(
-            api_key=self.api_key.get_secret_value(),
+            api_key=api_key,
             max_retries=self.max_retries,
             timeout=self.timeout_in_seconds,
         )

unstructured_ingest-1.0.15/unstructured_ingest/__version__.py

@@ -1 +0,0 @@
-__version__ = "1.0.15"  # pragma: no cover