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

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

@@ -8,20 +8,20 @@ from typing import TYPE_CHECKING, Any, Generator, Optional, Union
 
 from pydantic import BaseModel, Field, Secret, SecretStr, field_validator
 
+from unstructured_ingest.data_types.file_data import (
+    BatchFileData,
+    BatchItem,
+    FileData,
+    FileDataSourceMetadata,
+    SourceIdentifiers,
+)
 from unstructured_ingest.error import (
     DestinationConnectionError,
     SourceConnectionError,
     SourceConnectionNetworkError,
     WriteError,
 )
-from unstructured_ingest.utils.data_prep import (
-    batch_generator,
-    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.interfaces import (
+from unstructured_ingest.interfaces import (
     AccessConfig,
     ConnectionConfig,
     Downloader,
@@ -35,19 +35,19 @@ from unstructured_ingest.v2.interfaces import (
     UploadStagerConfig,
     download_responses,
 )
-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.types.file_data import (
-    BatchFileData,
-    BatchItem,
-    FileData,
-    FileDataSourceMetadata,
-    SourceIdentifiers,
+from unstructured_ingest.utils.constants import RECORD_ID_LABEL
+from unstructured_ingest.utils.data_prep import (
+    batch_generator,
+    flatten_dict,
+    generator_batching_wbytes,
+    get_enhanced_element_id,
 )
-from unstructured_ingest.v2.utils import get_enhanced_element_id
+from unstructured_ingest.utils.dep_check import requires_dependencies
 
 if TYPE_CHECKING:
     from elasticsearch import Elasticsearch as ElasticsearchClient

unstructured_ingest/{v2/processes → processes}/connectors/elasticsearch/opensearch.py

@@ -7,17 +7,16 @@ from pydantic import BaseModel, Field, Secret, field_validator
 from unstructured_ingest.error import (
     DestinationConnectionError,
 )
-from unstructured_ingest.utils.dep_check import requires_dependencies
-from unstructured_ingest.v2.interfaces import (
+from unstructured_ingest.interfaces import (
     AccessConfig,
     ConnectionConfig,
 )
-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.elasticsearch.elasticsearch import (
+from unstructured_ingest.processes.connectors.elasticsearch.elasticsearch import (
     ElasticsearchDownloader,
     ElasticsearchDownloaderConfig,
     ElasticsearchIndexer,
@@ -27,6 +26,7 @@ from unstructured_ingest.v2.processes.connectors.elasticsearch.elasticsearch imp
     ElasticsearchUploadStager,
     ElasticsearchUploadStagerConfig,
 )
+from unstructured_ingest.utils.dep_check import requires_dependencies
 
 if TYPE_CHECKING:
     from opensearchpy import OpenSearch

unstructured_ingest/{v2/processes → processes}/connectors/fsspec/__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/fsspec/azure.py

@@ -7,14 +7,14 @@ 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.errors import ProviderError, UserAuthError, UserError
-from unstructured_ingest.v2.logger import logger
-from unstructured_ingest.v2.processes.connector_registry import (
+from unstructured_ingest.data_types.file_data import FileDataSourceMetadata
+from unstructured_ingest.errors_v2 import ProviderError, UserAuthError, UserError
+from unstructured_ingest.logger import logger
+from unstructured_ingest.processes.connector_registry import (
     DestinationRegistryEntry,
     SourceRegistryEntry,
 )
-from unstructured_ingest.v2.processes.connectors.fsspec.fsspec import (
+from unstructured_ingest.processes.connectors.fsspec.fsspec import (
     FsspecAccessConfig,
     FsspecConnectionConfig,
     FsspecDownloader,
@@ -24,12 +24,12 @@ from unstructured_ingest.v2.processes.connectors.fsspec.fsspec import (
     FsspecUploader,
     FsspecUploaderConfig,
 )
-from unstructured_ingest.v2.processes.connectors.fsspec.utils import json_serial, sterilize_dict
-from unstructured_ingest.v2.processes.utils.blob_storage import (
+from unstructured_ingest.processes.connectors.fsspec.utils import json_serial, sterilize_dict
+from unstructured_ingest.processes.utils.blob_storage import (
     BlobStoreUploadStager,
     BlobStoreUploadStagerConfig,
 )
-from unstructured_ingest.v2.types.file_data import FileDataSourceMetadata
+from unstructured_ingest.utils.dep_check import requires_dependencies
 
 if TYPE_CHECKING:
     from adlfs import AzureBlobFileSystem

unstructured_ingest/{v2/processes → processes}/connectors/fsspec/box.py

@@ -9,14 +9,14 @@ from dateutil import parser
 from pydantic import Field, Secret
 from pydantic.functional_validators import BeforeValidator
 
-from unstructured_ingest.utils.dep_check import requires_dependencies
-from unstructured_ingest.v2.errors import ProviderError, UserAuthError, UserError
-from unstructured_ingest.v2.logger import logger
-from unstructured_ingest.v2.processes.connector_registry import (
+from unstructured_ingest.data_types.file_data import FileDataSourceMetadata
+from unstructured_ingest.errors_v2 import ProviderError, UserAuthError, UserError
+from unstructured_ingest.logger import logger
+from unstructured_ingest.processes.connector_registry import (
     DestinationRegistryEntry,
     SourceRegistryEntry,
 )
-from unstructured_ingest.v2.processes.connectors.fsspec.fsspec import (
+from unstructured_ingest.processes.connectors.fsspec.fsspec import (
     FsspecAccessConfig,
     FsspecConnectionConfig,
     FsspecDownloader,
@@ -26,12 +26,12 @@ from unstructured_ingest.v2.processes.connectors.fsspec.fsspec import (
     FsspecUploader,
     FsspecUploaderConfig,
 )
-from unstructured_ingest.v2.processes.connectors.utils import conform_string_to_dict
-from unstructured_ingest.v2.processes.utils.blob_storage import (
+from unstructured_ingest.processes.connectors.utils import conform_string_to_dict
+from unstructured_ingest.processes.utils.blob_storage import (
     BlobStoreUploadStager,
     BlobStoreUploadStagerConfig,
 )
-from unstructured_ingest.v2.types.file_data import FileDataSourceMetadata
+from unstructured_ingest.utils.dep_check import requires_dependencies
 
 if TYPE_CHECKING:
     from boxfs import BoxFileSystem

unstructured_ingest/{v2/processes → processes}/connectors/fsspec/dropbox.py

@@ -6,21 +6,21 @@ from typing import TYPE_CHECKING, Any, Optional
 
 from pydantic import Field, Secret
 
-from unstructured_ingest.utils.dep_check import requires_dependencies
-from unstructured_ingest.v2.errors import (
+from unstructured_ingest.data_types.file_data import FileDataSourceMetadata
+from unstructured_ingest.errors_v2 import (
     ProviderError,
     UserAuthError,
     UserError,
 )
-from unstructured_ingest.v2.errors import (
+from unstructured_ingest.errors_v2 import (
     RateLimitError as CustomRateLimitError,
 )
-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.fsspec.fsspec import (
+from unstructured_ingest.processes.connectors.fsspec.fsspec import (
     FsspecAccessConfig,
     FsspecConnectionConfig,
     FsspecDownloader,
@@ -30,11 +30,11 @@ from unstructured_ingest.v2.processes.connectors.fsspec.fsspec import (
     FsspecUploader,
     FsspecUploaderConfig,
 )
-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 FileDataSourceMetadata
+from unstructured_ingest.utils.dep_check import requires_dependencies
 
 if TYPE_CHECKING:
     pass

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

@@ -12,7 +12,12 @@ from uuid import NAMESPACE_DNS, uuid5
 
 from pydantic import BaseModel, Field, Secret
 
-from unstructured_ingest.v2.interfaces import (
+from unstructured_ingest.data_types.file_data import (
+    FileData,
+    FileDataSourceMetadata,
+    SourceIdentifiers,
+)
+from unstructured_ingest.interfaces import (
     AccessConfig,
     ConnectionConfig,
     Downloader,
@@ -23,13 +28,8 @@ from unstructured_ingest.v2.interfaces import (
     Uploader,
     UploaderConfig,
 )
-from unstructured_ingest.v2.logger import logger
-from unstructured_ingest.v2.processes.connectors.fsspec.utils import sterilize_dict
-from unstructured_ingest.v2.types.file_data import (
-    FileData,
-    FileDataSourceMetadata,
-    SourceIdentifiers,
-)
+from unstructured_ingest.logger import logger
+from unstructured_ingest.processes.connectors.fsspec.utils import sterilize_dict
 
 if TYPE_CHECKING:
     from fsspec import AbstractFileSystem

unstructured_ingest/{v2/processes → processes}/connectors/fsspec/gcs.py

@@ -9,15 +9,14 @@ from typing import TYPE_CHECKING, Any, Generator, Optional, Union
 from dateutil import parser
 from pydantic import Field, Secret
 
-from unstructured_ingest.utils.dep_check import requires_dependencies
-from unstructured_ingest.utils.string_and_date_utils import json_to_dict
-from unstructured_ingest.v2.errors import ProviderError, UserError
-from unstructured_ingest.v2.logger import logger
-from unstructured_ingest.v2.processes.connector_registry import (
+from unstructured_ingest.data_types.file_data import FileDataSourceMetadata
+from unstructured_ingest.errors_v2 import ProviderError, UserError
+from unstructured_ingest.logger import logger
+from unstructured_ingest.processes.connector_registry import (
     DestinationRegistryEntry,
     SourceRegistryEntry,
 )
-from unstructured_ingest.v2.processes.connectors.fsspec.fsspec import (
+from unstructured_ingest.processes.connectors.fsspec.fsspec import (
     FsspecAccessConfig,
     FsspecConnectionConfig,
     FsspecDownloader,
@@ -27,11 +26,12 @@ from unstructured_ingest.v2.processes.connectors.fsspec.fsspec import (
     FsspecUploader,
     FsspecUploaderConfig,
 )
-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 FileDataSourceMetadata
+from unstructured_ingest.utils.dep_check import requires_dependencies
+from unstructured_ingest.utils.string_and_date_utils import json_to_dict
 
 if TYPE_CHECKING:
     from gcsfs import GCSFileSystem

unstructured_ingest/{v2/processes → processes}/connectors/fsspec/s3.py

@@ -6,14 +6,16 @@ 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.errors import ProviderError, UserAuthError, UserError
-from unstructured_ingest.v2.logger import logger
-from unstructured_ingest.v2.processes.connector_registry import (
+from unstructured_ingest.data_types.file_data import (
+    FileDataSourceMetadata,
+)
+from unstructured_ingest.errors_v2 import ProviderError, UserAuthError, UserError
+from unstructured_ingest.logger import logger
+from unstructured_ingest.processes.connector_registry import (
     DestinationRegistryEntry,
     SourceRegistryEntry,
 )
-from unstructured_ingest.v2.processes.connectors.fsspec.fsspec import (
+from unstructured_ingest.processes.connectors.fsspec.fsspec import (
     FsspecAccessConfig,
     FsspecConnectionConfig,
     FsspecDownloader,
@@ -23,13 +25,11 @@ from unstructured_ingest.v2.processes.connectors.fsspec.fsspec import (
     FsspecUploader,
     FsspecUploaderConfig,
 )
-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 (
-    FileDataSourceMetadata,
-)
+from unstructured_ingest.utils.dep_check import requires_dependencies
 
 CONNECTOR_TYPE = "s3"
 

unstructured_ingest/{v2/processes → processes}/connectors/fsspec/sftp.py

@@ -10,12 +10,12 @@ from urllib.parse import urlparse
 
 from pydantic import Field, Secret
 
-from unstructured_ingest.utils.dep_check import requires_dependencies
-from unstructured_ingest.v2.processes.connector_registry import (
+from unstructured_ingest.data_types.file_data import FileData, FileDataSourceMetadata
+from unstructured_ingest.processes.connector_registry import (
     DestinationRegistryEntry,
     SourceRegistryEntry,
 )
-from unstructured_ingest.v2.processes.connectors.fsspec.fsspec import (
+from unstructured_ingest.processes.connectors.fsspec.fsspec import (
     FsspecAccessConfig,
     FsspecConnectionConfig,
     FsspecDownloader,
@@ -25,11 +25,11 @@ from unstructured_ingest.v2.processes.connectors.fsspec.fsspec import (
     FsspecUploader,
     FsspecUploaderConfig,
 )
-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
+from unstructured_ingest.utils.dep_check import requires_dependencies
 
 if TYPE_CHECKING:
     from fsspec.implementations.sftp import SFTPFileSystem

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

@@ -7,9 +7,13 @@ from uuid import NAMESPACE_DNS, uuid5
 
 from pydantic import Field, Secret, field_validator
 
-from unstructured_ingest.utils.dep_check import requires_dependencies
-from unstructured_ingest.v2.errors import ProviderError, UserAuthError, UserError
-from unstructured_ingest.v2.interfaces import (
+from unstructured_ingest.data_types.file_data import (
+    FileData,
+    FileDataSourceMetadata,
+    SourceIdentifiers,
+)
+from unstructured_ingest.errors_v2 import ProviderError, UserAuthError, UserError
+from unstructured_ingest.interfaces import (
     AccessConfig,
     ConnectionConfig,
     Downloader,
@@ -18,15 +22,11 @@ from unstructured_ingest.v2.interfaces import (
     IndexerConfig,
     download_responses,
 )
-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
 
 if TYPE_CHECKING:
     from github import ContentFile, GitTreeElement, Repository

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

@@ -8,9 +8,13 @@ from urllib.parse import urlparse
 
 from pydantic import Field, Secret, model_validator
 
+from unstructured_ingest.data_types.file_data import (
+    FileData,
+    FileDataSourceMetadata,
+    SourceIdentifiers,
+)
 from unstructured_ingest.error import SourceConnectionError
-from unstructured_ingest.utils.dep_check import requires_dependencies
-from unstructured_ingest.v2.interfaces import (
+from unstructured_ingest.interfaces import (
     AccessConfig,
     ConnectionConfig,
     Downloader,
@@ -19,13 +23,9 @@ from unstructured_ingest.v2.interfaces import (
     Indexer,
     IndexerConfig,
 )
-from unstructured_ingest.v2.logger import logger
-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
 
 CONNECTOR_TYPE = "gitlab"
 if TYPE_CHECKING:

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

@@ -9,13 +9,16 @@ from dateutil import parser
 from pydantic import Field, Secret
 from pydantic.functional_validators import BeforeValidator
 
+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.utils.google_filetype import GOOGLE_DRIVE_EXPORT_TYPES
-from unstructured_ingest.v2.interfaces import (
+from unstructured_ingest.interfaces import (
     AccessConfig,
     ConnectionConfig,
     Downloader,
@@ -24,21 +27,27 @@ from unstructured_ingest.v2.interfaces import (
     Indexer,
     IndexerConfig,
 )
-from unstructured_ingest.v2.logger import logger
-from unstructured_ingest.v2.processes.connector_registry import SourceRegistryEntry
-from unstructured_ingest.v2.processes.connectors.utils import conform_string_to_dict
-from unstructured_ingest.v2.types.file_data import (
-    FileData,
-    FileDataSourceMetadata,
-    SourceIdentifiers,
-)
-
-CONNECTOR_TYPE = "google_drive"
+from unstructured_ingest.logger import logger
+from unstructured_ingest.processes.connector_registry import SourceRegistryEntry
+from unstructured_ingest.processes.connectors.utils import conform_string_to_dict
+from unstructured_ingest.utils.dep_check import requires_dependencies
 
 if TYPE_CHECKING:
     from googleapiclient.discovery import Resource as GoogleAPIResource
     from googleapiclient.http import MediaIoBaseDownload
 
+CONNECTOR_TYPE = "google_drive"
+
+GOOGLE_DRIVE_EXPORT_TYPES = {
+    "application/vnd.google-apps.document": "application/"
+    "vnd.openxmlformats-officedocument.wordprocessingml.document",
+    "application/vnd.google-apps.spreadsheet": "application/"
+    "vnd.openxmlformats-officedocument.spreadsheetml.sheet",
+    "application/vnd.google-apps.presentation": "application/"
+    "vnd.openxmlformats-officedocument.presentationml.presentation",
+    "application/vnd.google-apps.photo": "image/jpeg",
+}
+
 
 class GoogleDriveAccessConfig(AccessConfig):
     service_account_key: Optional[Annotated[dict, BeforeValidator(conform_string_to_dict)]] = Field(

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

@@ -1,6 +1,6 @@
 from __future__ import annotations
 
-from unstructured_ingest.v2.processes.connector_registry import add_destination_entry
+from unstructured_ingest.processes.connector_registry import add_destination_entry
 
 from .ibm_watsonx_s3 import CONNECTOR_TYPE as IBM_WATSONX_S3_CONNECTOR_TYPE
 from .ibm_watsonx_s3 import ibm_watsonx_s3_destination_entry

unstructured_ingest/{v2/processes → processes}/connectors/ibm_watsonx/ibm_watsonx_s3.py

@@ -8,25 +8,25 @@ from typing import TYPE_CHECKING, Any, Generator, Optional, Tuple
 import pandas as pd
 from pydantic import Field, Secret
 
-from unstructured_ingest.utils.data_prep import get_data_df
-from unstructured_ingest.utils.dep_check import requires_dependencies
-from unstructured_ingest.v2.constants import RECORD_ID_LABEL
-from unstructured_ingest.v2.errors import ProviderError, UserAuthError, UserError
-from unstructured_ingest.v2.interfaces import (
+from unstructured_ingest.data_types.file_data import FileData
+from unstructured_ingest.errors_v2 import ProviderError, UserAuthError, UserError
+from unstructured_ingest.interfaces import (
     AccessConfig,
     ConnectionConfig,
     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,
 )
-from unstructured_ingest.v2.processes.connectors.sql.sql import (
+from unstructured_ingest.processes.connectors.sql.sql import (
     SQLUploader,
     SQLUploadStager,
     SQLUploadStagerConfig,
 )
-from unstructured_ingest.v2.types.file_data import FileData
+from unstructured_ingest.utils.constants import RECORD_ID_LABEL
+from unstructured_ingest.utils.data_prep import get_data_df
+from unstructured_ingest.utils.dep_check import requires_dependencies
 
 if TYPE_CHECKING:
     from pyarrow import Table as ArrowTable

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

@@ -7,9 +7,13 @@ from typing import TYPE_CHECKING, Any, Dict, Generator, List, Optional, Union
 
 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.utils.dep_check import requires_dependencies
-from unstructured_ingest.v2.interfaces import (
+from unstructured_ingest.interfaces import (
     AccessConfig,
     ConnectionConfig,
     Downloader,
@@ -18,15 +22,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
 
 if TYPE_CHECKING:
     from atlassian import Jira

unstructured_ingest/{v2/processes → processes}/connectors/kafka/__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/kafka/cloud.py

@@ -4,12 +4,12 @@ from typing import TYPE_CHECKING
 
 from pydantic import Field, Secret, SecretStr
 
-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.kafka.kafka import (
+from unstructured_ingest.processes.connectors.kafka.kafka import (
     KafkaAccessConfig,
     KafkaConnectionConfig,
     KafkaDownloader,

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

@@ -8,14 +8,17 @@ from typing import TYPE_CHECKING, Any, ContextManager, Generator, Optional
 
 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.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,
     Downloader,
@@ -26,12 +29,9 @@ from unstructured_ingest.v2.interfaces import (
     Uploader,
     UploaderConfig,
 )
-from unstructured_ingest.v2.logger import logger
-from unstructured_ingest.v2.types.file_data import (
-    FileData,
-    FileDataSourceMetadata,
-    SourceIdentifiers,
-)
+from unstructured_ingest.logger import logger
+from unstructured_ingest.utils.data_prep import batch_generator
+from unstructured_ingest.utils.dep_check import requires_dependencies
 
 if TYPE_CHECKING:
     from confluent_kafka import Consumer, Producer

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

@@ -3,11 +3,11 @@ from typing import TYPE_CHECKING
 
 from pydantic import Field, Secret
 
-from unstructured_ingest.v2.processes.connector_registry import (
+from unstructured_ingest.processes.connector_registry import (
     DestinationRegistryEntry,
     SourceRegistryEntry,
 )
-from unstructured_ingest.v2.processes.connectors.kafka.kafka import (
+from unstructured_ingest.processes.connectors.kafka.kafka import (
     KafkaAccessConfig,
     KafkaConnectionConfig,
     KafkaDownloader,