unstructured-ingest 0.6.4__py3-none-any.whl → 0.7.1__py3-none-any.whl

unstructured_ingest/{v2/processes → processes}/connectors/onedrive.py

@@ -10,13 +10,17 @@ from typing import TYPE_CHECKING, Any, AsyncIterator, Optional
 from dateutil import parser
 from pydantic import Field, Secret
 
+from unstructured_ingest.data_types.file_data import (
+    FileData,
+    FileDataSourceMetadata,
+    SourceIdentifiers,
+)
 from unstructured_ingest.error import (
     DestinationConnectionError,
     SourceConnectionError,
     SourceConnectionNetworkError,
 )
-from unstructured_ingest.utils.dep_check import requires_dependencies
-from unstructured_ingest.v2.interfaces import (
+from unstructured_ingest.interfaces import (
     AccessConfig,
     ConnectionConfig,
     Downloader,
@@ -27,20 +31,16 @@ from unstructured_ingest.v2.interfaces import (
     Uploader,
     UploaderConfig,
 )
-from unstructured_ingest.v2.logger import logger
-from unstructured_ingest.v2.processes.connector_registry import (
+from unstructured_ingest.logger import logger
+from unstructured_ingest.processes.connector_registry import (
     DestinationRegistryEntry,
     SourceRegistryEntry,
 )
-from unstructured_ingest.v2.processes.utils.blob_storage import (
+from unstructured_ingest.processes.utils.blob_storage import (
     BlobStoreUploadStager,
     BlobStoreUploadStagerConfig,
 )
-from unstructured_ingest.v2.types.file_data import (
-    FileData,
-    FileDataSourceMetadata,
-    SourceIdentifiers,
-)
+from unstructured_ingest.utils.dep_check import requires_dependencies
 
 if TYPE_CHECKING:
     from office365.graph_client import GraphClient
@@ -53,11 +53,14 @@ MAX_BYTES_SIZE = 512_000_000
 
 class OnedriveAccessConfig(AccessConfig):
     client_cred: str = Field(description="Microsoft App client secret")
+    password: Optional[str] = Field(description="Service account password", default=None)
 
 
 class OnedriveConnectionConfig(ConnectionConfig):
     client_id: str = Field(description="Microsoft app client ID")
-    user_pname: str = Field(description="User principal name, usually is your Azure AD email.")
+    user_pname: str = Field(
+        description="User principal name or service account, usually your Azure AD email."
+    )
     tenant: str = Field(
         repr=False, description="ID or domain name associated with your Azure AD instance"
     )
@@ -74,25 +77,50 @@ class OnedriveConnectionConfig(ConnectionConfig):
         drive = client.users[self.user_pname].drive
         return drive
 
-    @requires_dependencies(["msal"], extras="onedrive")
+    @requires_dependencies(["msal", "requests"], extras="onedrive")
     def get_token(self):
         from msal import ConfidentialClientApplication
+        from requests import post
+
+        if self.access_config.get_secret_value().password:
+            url = f"https://login.microsoftonline.com/{self.tenant}/oauth2/v2.0/token"
+            headers = {"Content-Type": "application/x-www-form-urlencoded"}
+            data = {
+                "grant_type": "password",
+                "username": self.user_pname,
+                "password": self.access_config.get_secret_value().password,
+                "client_id": self.client_id,
+                "client_secret": self.access_config.get_secret_value().client_cred,
+                "scope": "https://graph.microsoft.com/.default",
+            }
+            response = post(url, headers=headers, data=data)
+            if response.status_code == 200:
+                return response.json()
+            else:
+                raise SourceConnectionError(
+                    f"Oauth2 authentication failed with {response.status_code}: {response.text}"
+                )
 
-        try:
-            app = ConfidentialClientApplication(
-                authority=f"{self.authority_url}/{self.tenant}",
-                client_id=self.client_id,
-                client_credential=self.access_config.get_secret_value().client_cred,
-            )
-            token = app.acquire_token_for_client(scopes=["https://graph.microsoft.com/.default"])
-        except ValueError as exc:
-            logger.error("Couldn't set up credentials for OneDrive")
-            raise exc
-        if "error" in token:
-            raise SourceConnectionNetworkError(
-                "failed to fetch token, {}: {}".format(token["error"], token["error_description"])
-            )
-        return token
+        else:
+            try:
+                app = ConfidentialClientApplication(
+                    authority=f"{self.authority_url}/{self.tenant}",
+                    client_id=self.client_id,
+                    client_credential=self.access_config.get_secret_value().client_cred,
+                )
+                token = app.acquire_token_for_client(
+                    scopes=["https://graph.microsoft.com/.default"]
+                )
+            except ValueError as exc:
+                logger.error("Couldn't set up credentials.")
+                raise exc
+            if "error" in token:
+                raise SourceConnectionNetworkError(
+                    "failed to fetch token, {}: {}".format(
+                        token["error"], token["error_description"]
+                    )
+                )
+            return token
 
     @requires_dependencies(["office365"], extras="onedrive")
     def get_client(self) -> "GraphClient":

unstructured_ingest/{v2/processes → processes}/connectors/outlook.py

@@ -7,10 +7,13 @@ from typing import TYPE_CHECKING, Any, Coroutine, Generator
 
 from pydantic import Field, Secret
 
+from unstructured_ingest.data_types.file_data import (
+    FileData,
+    FileDataSourceMetadata,
+    SourceIdentifiers,
+)
 from unstructured_ingest.error import SourceConnectionError
-from unstructured_ingest.logger import logger
-from unstructured_ingest.utils.dep_check import requires_dependencies
-from unstructured_ingest.v2.interfaces import (
+from unstructured_ingest.interfaces import (
     AccessConfig,
     ConnectionConfig,
     Downloader,
@@ -19,12 +22,9 @@ from unstructured_ingest.v2.interfaces import (
     Indexer,
     IndexerConfig,
 )
-from unstructured_ingest.v2.processes.connector_registry import SourceRegistryEntry
-from unstructured_ingest.v2.types.file_data import (
-    FileData,
-    FileDataSourceMetadata,
-    SourceIdentifiers,
-)
+from unstructured_ingest.logger import logger
+from unstructured_ingest.processes.connector_registry import SourceRegistryEntry
+from unstructured_ingest.utils.dep_check import requires_dependencies
 
 MAX_EMAILS_PER_FOLDER = 1_000_000  # Maximum number of emails per folder
 

unstructured_ingest/{v2/processes → processes}/connectors/pinecone.py

@@ -5,12 +5,10 @@ from typing import TYPE_CHECKING, Any, Literal, Optional
 
 from pydantic import Field, Secret
 
+from unstructured_ingest.data_types.file_data import FileData
 from unstructured_ingest.error import DestinationConnectionError
-from unstructured_ingest.utils.data_prep import flatten_dict, generator_batching_wbytes
-from unstructured_ingest.utils.dep_check import requires_dependencies
-from unstructured_ingest.v2.constants import RECORD_ID_LABEL
-from unstructured_ingest.v2.errors import UserError
-from unstructured_ingest.v2.interfaces import (
+from unstructured_ingest.errors_v2 import UserError
+from unstructured_ingest.interfaces import (
     AccessConfig,
     ConnectionConfig,
     UploaderConfig,
@@ -18,10 +16,15 @@ from unstructured_ingest.v2.interfaces import (
     UploadStagerConfig,
     VectorDBUploader,
 )
-from unstructured_ingest.v2.logger import logger
-from unstructured_ingest.v2.processes.connector_registry import DestinationRegistryEntry
-from unstructured_ingest.v2.types.file_data import FileData
-from unstructured_ingest.v2.utils import get_enhanced_element_id
+from unstructured_ingest.logger import logger
+from unstructured_ingest.processes.connector_registry import DestinationRegistryEntry
+from unstructured_ingest.utils.constants import RECORD_ID_LABEL
+from unstructured_ingest.utils.data_prep import (
+    flatten_dict,
+    generator_batching_wbytes,
+    get_enhanced_element_id,
+)
+from unstructured_ingest.utils.dep_check import requires_dependencies
 
 if TYPE_CHECKING:
     from pinecone import Index as PineconeIndex

unstructured_ingest/{v2/processes → processes}/connectors/qdrant/__init__.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from unstructured_ingest.v2.processes.connector_registry import (
+from unstructured_ingest.processes.connector_registry import (
     add_destination_entry,
 )
 

unstructured_ingest/{v2/processes → processes}/connectors/qdrant/cloud.py

@@ -2,8 +2,8 @@ from dataclasses import dataclass
 
 from pydantic import Field, Secret
 
-from unstructured_ingest.v2.processes.connector_registry import DestinationRegistryEntry
-from unstructured_ingest.v2.processes.connectors.qdrant.qdrant import (
+from unstructured_ingest.processes.connector_registry import DestinationRegistryEntry
+from unstructured_ingest.processes.connectors.qdrant.qdrant import (
     QdrantAccessConfig,
     QdrantConnectionConfig,
     QdrantUploader,

unstructured_ingest/{v2/processes → processes}/connectors/qdrant/local.py

@@ -2,8 +2,8 @@ from dataclasses import dataclass
 
 from pydantic import Field, Secret
 
-from unstructured_ingest.v2.processes.connector_registry import DestinationRegistryEntry
-from unstructured_ingest.v2.processes.connectors.qdrant.qdrant import (
+from unstructured_ingest.processes.connector_registry import DestinationRegistryEntry
+from unstructured_ingest.processes.connectors.qdrant.qdrant import (
     QdrantAccessConfig,
     QdrantConnectionConfig,
     QdrantUploader,

unstructured_ingest/{v2/processes → processes}/connectors/qdrant/qdrant.py

@@ -7,10 +7,9 @@ from typing import TYPE_CHECKING, Any, AsyncGenerator, Generator, Optional
 
 from pydantic import Field, Secret
 
+from unstructured_ingest.data_types.file_data import FileData
 from unstructured_ingest.error import DestinationConnectionError, WriteError
-from unstructured_ingest.utils.data_prep import batch_generator, flatten_dict
-from unstructured_ingest.utils.dep_check import requires_dependencies
-from unstructured_ingest.v2.interfaces import (
+from unstructured_ingest.interfaces import (
     AccessConfig,
     ConnectionConfig,
     Uploader,
@@ -18,9 +17,13 @@ from unstructured_ingest.v2.interfaces import (
     UploadStager,
     UploadStagerConfig,
 )
-from unstructured_ingest.v2.logger import logger
-from unstructured_ingest.v2.types.file_data import FileData
-from unstructured_ingest.v2.utils import get_enhanced_element_id
+from unstructured_ingest.logger import logger
+from unstructured_ingest.utils.data_prep import (
+    batch_generator,
+    flatten_dict,
+    get_enhanced_element_id,
+)
+from unstructured_ingest.utils.dep_check import requires_dependencies
 
 if TYPE_CHECKING:
     from qdrant_client import AsyncQdrantClient, QdrantClient

unstructured_ingest/{v2/processes → processes}/connectors/qdrant/server.py

@@ -2,8 +2,8 @@ from dataclasses import dataclass
 
 from pydantic import Field, Secret
 
-from unstructured_ingest.v2.processes.connector_registry import DestinationRegistryEntry
-from unstructured_ingest.v2.processes.connectors.qdrant.qdrant import (
+from unstructured_ingest.processes.connector_registry import DestinationRegistryEntry
+from unstructured_ingest.processes.connectors.qdrant.qdrant import (
     QdrantAccessConfig,
     QdrantConnectionConfig,
     QdrantUploader,

unstructured_ingest/{v2/processes → processes}/connectors/redisdb.py

@@ -5,18 +5,18 @@ from typing import TYPE_CHECKING, Any, AsyncGenerator, Generator, Optional
 
 from pydantic import Field, Secret, model_validator
 
+from unstructured_ingest.data_types.file_data import FileData
 from unstructured_ingest.error import DestinationConnectionError
-from unstructured_ingest.utils.data_prep import batch_generator
-from unstructured_ingest.utils.dep_check import requires_dependencies
-from unstructured_ingest.v2.interfaces import (
+from unstructured_ingest.interfaces import (
     AccessConfig,
     ConnectionConfig,
     Uploader,
     UploaderConfig,
 )
-from unstructured_ingest.v2.logger import logger
-from unstructured_ingest.v2.processes.connector_registry import DestinationRegistryEntry
-from unstructured_ingest.v2.types.file_data import FileData
+from unstructured_ingest.logger import logger
+from unstructured_ingest.processes.connector_registry import DestinationRegistryEntry
+from unstructured_ingest.utils.data_prep import batch_generator
+from unstructured_ingest.utils.dep_check import requires_dependencies
 
 if TYPE_CHECKING:
     from redis.asyncio import Redis

unstructured_ingest/{v2/processes → processes}/connectors/salesforce.py

@@ -20,9 +20,13 @@ from typing import TYPE_CHECKING, Any, Generator, Optional, Type
 from dateutil import parser
 from pydantic import Field, Secret
 
+from unstructured_ingest.data_types.file_data import (
+    FileData,
+    FileDataSourceMetadata,
+    SourceIdentifiers,
+)
 from unstructured_ingest.error import SourceConnectionError, SourceConnectionNetworkError
-from unstructured_ingest.utils.dep_check import requires_dependencies
-from unstructured_ingest.v2.interfaces import (
+from unstructured_ingest.interfaces import (
     AccessConfig,
     ConnectionConfig,
     Downloader,
@@ -31,15 +35,11 @@ from unstructured_ingest.v2.interfaces import (
     Indexer,
     IndexerConfig,
 )
-from unstructured_ingest.v2.logger import logger
-from unstructured_ingest.v2.processes.connector_registry import (
+from unstructured_ingest.logger import logger
+from unstructured_ingest.processes.connector_registry import (
     SourceRegistryEntry,
 )
-from unstructured_ingest.v2.types.file_data import (
-    FileData,
-    FileDataSourceMetadata,
-    SourceIdentifiers,
-)
+from unstructured_ingest.utils.dep_check import requires_dependencies
 
 
 class MissingCategoryError(Exception):

unstructured_ingest/{v2/processes → processes}/connectors/sharepoint.py

@@ -6,16 +6,18 @@ from typing import TYPE_CHECKING, Any, AsyncIterator
 
 from pydantic import Field
 
+from unstructured_ingest.data_types.file_data import (
+    FileData,
+)
 from unstructured_ingest.error import (
     SourceConnectionError,
     SourceConnectionNetworkError,
 )
-from unstructured_ingest.utils.dep_check import requires_dependencies
-from unstructured_ingest.v2.logger import logger
-from unstructured_ingest.v2.processes.connector_registry import (
+from unstructured_ingest.logger import logger
+from unstructured_ingest.processes.connector_registry import (
     SourceRegistryEntry,
 )
-from unstructured_ingest.v2.processes.connectors.onedrive import (
+from unstructured_ingest.processes.connectors.onedrive import (
     OnedriveAccessConfig,
     OnedriveConnectionConfig,
     OnedriveDownloader,
@@ -23,9 +25,7 @@ from unstructured_ingest.v2.processes.connectors.onedrive import (
     OnedriveIndexer,
     OnedriveIndexerConfig,
 )
-from unstructured_ingest.v2.types.file_data import (
-    FileData,
-)
+from unstructured_ingest.utils.dep_check import requires_dependencies
 
 if TYPE_CHECKING:
     from office365.onedrive.driveitems.driveItem import DriveItem
@@ -100,7 +100,7 @@ class SharepointDownloader(OnedriveDownloader):
     connector_type: str = CONNECTOR_TYPE
 
     @SourceConnectionNetworkError.wrap
-    @requires_dependencies(["office365"], extras="onedrive")
+    @requires_dependencies(["office365"], extras="sharepoint")
     def _fetch_file(self, file_data: FileData) -> DriveItem:
         from office365.runtime.client_request_exception import ClientRequestException
 

unstructured_ingest/{v2/processes → processes}/connectors/slack.py

@@ -8,10 +8,13 @@ from typing import TYPE_CHECKING, Any, Generator, Optional
 
 from pydantic import Field, Secret
 
+from unstructured_ingest.data_types.file_data import (
+    FileData,
+    FileDataSourceMetadata,
+    SourceIdentifiers,
+)
 from unstructured_ingest.error import SourceConnectionError
-from unstructured_ingest.logger import logger
-from unstructured_ingest.utils.dep_check import requires_dependencies
-from unstructured_ingest.v2.interfaces import (
+from unstructured_ingest.interfaces import (
     AccessConfig,
     ConnectionConfig,
     Downloader,
@@ -20,12 +23,9 @@ from unstructured_ingest.v2.interfaces import (
     Indexer,
     IndexerConfig,
 )
-from unstructured_ingest.v2.processes.connector_registry import SourceRegistryEntry
-from unstructured_ingest.v2.types.file_data import (
-    FileData,
-    FileDataSourceMetadata,
-    SourceIdentifiers,
-)
+from unstructured_ingest.logger import logger
+from unstructured_ingest.processes.connector_registry import SourceRegistryEntry
+from unstructured_ingest.utils.dep_check import requires_dependencies
 
 if TYPE_CHECKING:
     from slack_sdk import WebClient

unstructured_ingest/{v2/processes → processes}/connectors/sql/__init__.py

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from unstructured_ingest.v2.processes.connector_registry import (
+from unstructured_ingest.processes.connector_registry import (
     add_destination_entry,
     add_source_entry,
 )

unstructured_ingest/{v2/processes → processes}/connectors/sql/databricks_delta_tables.py

@@ -6,13 +6,12 @@ from typing import TYPE_CHECKING, Any, Generator, Optional
 
 from pydantic import Field, Secret
 
-from unstructured_ingest.utils.data_prep import split_dataframe
-from unstructured_ingest.utils.dep_check import requires_dependencies
-from unstructured_ingest.v2.logger import logger
-from unstructured_ingest.v2.processes.connector_registry import (
+from unstructured_ingest.data_types.file_data import FileData
+from unstructured_ingest.logger import logger
+from unstructured_ingest.processes.connector_registry import (
     DestinationRegistryEntry,
 )
-from unstructured_ingest.v2.processes.connectors.sql.sql import (
+from unstructured_ingest.processes.connectors.sql.sql import (
     SQLAccessConfig,
     SQLConnectionConfig,
     SQLUploader,
@@ -20,7 +19,8 @@ from unstructured_ingest.v2.processes.connectors.sql.sql import (
     SQLUploadStager,
     SQLUploadStagerConfig,
 )
-from unstructured_ingest.v2.types.file_data import FileData
+from unstructured_ingest.utils.data_prep import split_dataframe
+from unstructured_ingest.utils.dep_check import requires_dependencies
 
 if TYPE_CHECKING:
     from databricks.sdk.core import oauth_service_principal
@@ -203,7 +203,7 @@ class DatabricksDeltaTablesUploader(SQLUploader):
             f" table named {self.upload_config.table_name}"
             # f" with batch size {self.upload_config.batch_size}"
         )
-        # TODO: currently variable binding not supporting for list types,
+        # TODO: currently variable binding not supporting for list data_types,
         #  update once that gets resolved in SDK
         for rows in split_dataframe(df=df, chunk_size=self.upload_config.batch_size):
             with self.get_cursor() as cursor:

unstructured_ingest/{v2/processes → processes}/connectors/sql/postgres.py

@@ -4,13 +4,12 @@ from typing import TYPE_CHECKING, Generator, Optional
 
 from pydantic import Field, Secret
 
-from unstructured_ingest.utils.dep_check import requires_dependencies
-from unstructured_ingest.v2.logger import logger
-from unstructured_ingest.v2.processes.connector_registry import (
+from unstructured_ingest.logger import logger
+from unstructured_ingest.processes.connector_registry import (
     DestinationRegistryEntry,
     SourceRegistryEntry,
 )
-from unstructured_ingest.v2.processes.connectors.sql.sql import (
+from unstructured_ingest.processes.connectors.sql.sql import (
     SQLAccessConfig,
     SqlBatchFileData,
     SQLConnectionConfig,
@@ -23,6 +22,7 @@ from unstructured_ingest.v2.processes.connectors.sql.sql import (
     SQLUploadStager,
     SQLUploadStagerConfig,
 )
+from unstructured_ingest.utils.dep_check import requires_dependencies
 
 if TYPE_CHECKING:
     from psycopg2.extensions import connection as PostgresConnection

unstructured_ingest/{v2/processes → processes}/connectors/sql/singlestore.py

@@ -5,13 +5,12 @@ from typing import TYPE_CHECKING, Any, Generator, Optional
 
 from pydantic import Field, Secret
 
-from unstructured_ingest.utils.dep_check import requires_dependencies
-from unstructured_ingest.v2.logger import logger
-from unstructured_ingest.v2.processes.connector_registry import (
+from unstructured_ingest.logger import logger
+from unstructured_ingest.processes.connector_registry import (
     DestinationRegistryEntry,
     SourceRegistryEntry,
 )
-from unstructured_ingest.v2.processes.connectors.sql.sql import (
+from unstructured_ingest.processes.connectors.sql.sql import (
     _DATE_COLUMNS,
     SQLAccessConfig,
     SqlBatchFileData,
@@ -26,6 +25,7 @@ from unstructured_ingest.v2.processes.connectors.sql.sql import (
     SQLUploadStagerConfig,
     parse_date_string,
 )
+from unstructured_ingest.utils.dep_check import requires_dependencies
 
 if TYPE_CHECKING:
     from singlestoredb.connection import Connection as SingleStoreConnection

unstructured_ingest/{v2/processes → processes}/connectors/sql/snowflake.py

@@ -5,14 +5,13 @@ from typing import TYPE_CHECKING, Any, Generator, Optional
 
 from pydantic import Field, Secret
 
-from unstructured_ingest.utils.data_prep import split_dataframe
-from unstructured_ingest.utils.dep_check import requires_dependencies
-from unstructured_ingest.v2.logger import logger
-from unstructured_ingest.v2.processes.connector_registry import (
+from unstructured_ingest.data_types.file_data import FileData
+from unstructured_ingest.logger import logger
+from unstructured_ingest.processes.connector_registry import (
     DestinationRegistryEntry,
     SourceRegistryEntry,
 )
-from unstructured_ingest.v2.processes.connectors.sql.sql import (
+from unstructured_ingest.processes.connectors.sql.sql import (
     _DATE_COLUMNS,
     SQLAccessConfig,
     SqlBatchFileData,
@@ -27,7 +26,8 @@ from unstructured_ingest.v2.processes.connectors.sql.sql import (
     SQLUploadStagerConfig,
     parse_date_string,
 )
-from unstructured_ingest.v2.types.file_data import FileData
+from unstructured_ingest.utils.data_prep import split_dataframe
+from unstructured_ingest.utils.dep_check import requires_dependencies
 
 if TYPE_CHECKING:
     from pandas import DataFrame

unstructured_ingest/{v2/processes → processes}/connectors/sql/sql.py

@@ -11,10 +11,15 @@ from typing import TYPE_CHECKING, Any, Generator, Union
 from dateutil import parser
 from pydantic import BaseModel, Field, Secret
 
+from unstructured_ingest.data_types.file_data import (
+    BatchFileData,
+    BatchItem,
+    FileData,
+    FileDataSourceMetadata,
+    SourceIdentifiers,
+)
 from unstructured_ingest.error import DestinationConnectionError, SourceConnectionError
-from unstructured_ingest.utils.data_prep import get_data, get_data_df, split_dataframe, write_data
-from unstructured_ingest.v2.constants import RECORD_ID_LABEL
-from unstructured_ingest.v2.interfaces import (
+from unstructured_ingest.interfaces import (
     AccessConfig,
     ConnectionConfig,
     Downloader,
@@ -28,15 +33,15 @@ from unstructured_ingest.v2.interfaces import (
     UploadStagerConfig,
     download_responses,
 )
-from unstructured_ingest.v2.logger import logger
-from unstructured_ingest.v2.types.file_data import (
-    BatchFileData,
-    BatchItem,
-    FileData,
-    FileDataSourceMetadata,
-    SourceIdentifiers,
+from unstructured_ingest.logger import logger
+from unstructured_ingest.utils.constants import RECORD_ID_LABEL
+from unstructured_ingest.utils.data_prep import (
+    get_data,
+    get_data_df,
+    get_enhanced_element_id,
+    split_dataframe,
+    write_data,
 )
-from unstructured_ingest.v2.utils import get_enhanced_element_id
 
 if TYPE_CHECKING:
     from pandas import DataFrame

unstructured_ingest/{v2/processes → processes}/connectors/sql/sqlite.py

@@ -6,13 +6,12 @@ from typing import TYPE_CHECKING, Any, Generator
 
 from pydantic import Field, Secret, model_validator
 
-from unstructured_ingest.utils.dep_check import requires_dependencies
-from unstructured_ingest.v2.logger import logger
-from unstructured_ingest.v2.processes.connector_registry import (
+from unstructured_ingest.logger import logger
+from unstructured_ingest.processes.connector_registry import (
     DestinationRegistryEntry,
     SourceRegistryEntry,
 )
-from unstructured_ingest.v2.processes.connectors.sql.sql import (
+from unstructured_ingest.processes.connectors.sql.sql import (
     _DATE_COLUMNS,
     SQLAccessConfig,
     SqlBatchFileData,
@@ -27,6 +26,7 @@ from unstructured_ingest.v2.processes.connectors.sql.sql import (
     SQLUploadStagerConfig,
     parse_date_string,
 )
+from unstructured_ingest.utils.dep_check import requires_dependencies
 
 if TYPE_CHECKING:
     from sqlite3 import Connection as SqliteConnection

unstructured_ingest/{v2/processes → processes}/connectors/sql/vastdb.py

@@ -4,16 +4,16 @@ from typing import TYPE_CHECKING, Any, Optional
 
 from pydantic import Field, Secret
 
+from unstructured_ingest.data_types.file_data import (
+    FileData,
+)
 from unstructured_ingest.error import DestinationConnectionError
-from unstructured_ingest.utils.data_prep import split_dataframe
-from unstructured_ingest.utils.dep_check import requires_dependencies
-from unstructured_ingest.v2.constants import RECORD_ID_LABEL
-from unstructured_ingest.v2.logger import logger
-from unstructured_ingest.v2.processes.connector_registry import (
+from unstructured_ingest.logger import logger
+from unstructured_ingest.processes.connector_registry import (
     DestinationRegistryEntry,
     SourceRegistryEntry,
 )
-from unstructured_ingest.v2.processes.connectors.sql.sql import (
+from unstructured_ingest.processes.connectors.sql.sql import (
     SQLAccessConfig,
     SqlBatchFileData,
     SQLConnectionConfig,
@@ -26,10 +26,9 @@ from unstructured_ingest.v2.processes.connectors.sql.sql import (
     SQLUploadStager,
     SQLUploadStagerConfig,
 )
-from unstructured_ingest.v2.types.file_data import (
-    FileData,
-)
-from unstructured_ingest.v2.utils import get_enhanced_element_id
+from unstructured_ingest.utils.constants import RECORD_ID_LABEL
+from unstructured_ingest.utils.data_prep import get_enhanced_element_id, split_dataframe
+from unstructured_ingest.utils.dep_check import requires_dependencies
 
 if TYPE_CHECKING:
     from pandas import DataFrame