unstructured-ingest 0.6.2__py3-none-any.whl → 0.7.0__py3-none-any.whl

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,

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

@@ -5,10 +5,9 @@ from typing import TYPE_CHECKING, Any, Generator, 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, get_data_df, split_dataframe
-from unstructured_ingest.utils.dep_check import requires_dependencies
-from unstructured_ingest.v2.interfaces import (
+from unstructured_ingest.interfaces import (
     AccessConfig,
     ConnectionConfig,
     Uploader,
@@ -16,12 +15,17 @@ from unstructured_ingest.v2.interfaces import (
     UploadStager,
     UploadStagerConfig,
 )
-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.types.file_data import FileData
-from unstructured_ingest.v2.utils import get_enhanced_element_id
+from unstructured_ingest.utils.data_prep import (
+    flatten_dict,
+    get_data_df,
+    get_enhanced_element_id,
+    split_dataframe,
+)
+from unstructured_ingest.utils.dep_check import requires_dependencies
 
 if TYPE_CHECKING:
     from kdbai_client import Database, Session, Table

unstructured_ingest/{v2/processes → processes}/connectors/lancedb/__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 .aws import CONNECTOR_TYPE as LANCEDB_S3_CONNECTOR_TYPE
 from .aws import lancedb_aws_destination_entry

unstructured_ingest/{v2/processes → processes}/connectors/lancedb/aws.py

@@ -2,9 +2,9 @@ from dataclasses import dataclass
 
 from pydantic import Field, Secret
 
-from unstructured_ingest.v2.interfaces.connector import AccessConfig
-from unstructured_ingest.v2.processes.connector_registry import DestinationRegistryEntry
-from unstructured_ingest.v2.processes.connectors.lancedb.lancedb import (
+from unstructured_ingest.interfaces.connector import AccessConfig
+from unstructured_ingest.processes.connector_registry import DestinationRegistryEntry
+from unstructured_ingest.processes.connectors.lancedb.lancedb import (
     LanceDBRemoteConnectionConfig,
     LanceDBUploader,
     LanceDBUploaderConfig,

unstructured_ingest/{v2/processes → processes}/connectors/lancedb/azure.py

@@ -2,9 +2,9 @@ from dataclasses import dataclass
 
 from pydantic import Field, Secret
 
-from unstructured_ingest.v2.interfaces.connector import AccessConfig
-from unstructured_ingest.v2.processes.connector_registry import DestinationRegistryEntry
-from unstructured_ingest.v2.processes.connectors.lancedb.lancedb import (
+from unstructured_ingest.interfaces.connector import AccessConfig
+from unstructured_ingest.processes.connector_registry import DestinationRegistryEntry
+from unstructured_ingest.processes.connectors.lancedb.lancedb import (
     LanceDBRemoteConnectionConfig,
     LanceDBUploader,
     LanceDBUploaderConfig,

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

@@ -2,9 +2,9 @@ from dataclasses import dataclass
 
 from pydantic import Field, Secret
 
-from unstructured_ingest.v2.interfaces.connector import AccessConfig
-from unstructured_ingest.v2.processes.connector_registry import DestinationRegistryEntry
-from unstructured_ingest.v2.processes.connectors.lancedb.lancedb import (
+from unstructured_ingest.interfaces.connector import AccessConfig
+from unstructured_ingest.processes.connector_registry import DestinationRegistryEntry
+from unstructured_ingest.processes.connectors.lancedb.lancedb import (
     LanceDBRemoteConnectionConfig,
     LanceDBUploader,
     LanceDBUploaderConfig,

unstructured_ingest/{v2/processes → processes}/connectors/lancedb/gcp.py

@@ -2,9 +2,9 @@ from dataclasses import dataclass
 
 from pydantic import Field, Secret
 
-from unstructured_ingest.v2.interfaces.connector import AccessConfig
-from unstructured_ingest.v2.processes.connector_registry import DestinationRegistryEntry
-from unstructured_ingest.v2.processes.connectors.lancedb.lancedb import (
+from unstructured_ingest.interfaces.connector import AccessConfig
+from unstructured_ingest.processes.connector_registry import DestinationRegistryEntry
+from unstructured_ingest.processes.connectors.lancedb.lancedb import (
     LanceDBRemoteConnectionConfig,
     LanceDBUploader,
     LanceDBUploaderConfig,

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

@@ -10,19 +10,19 @@ from typing import TYPE_CHECKING, Any, AsyncGenerator, Optional
 
 from pydantic import Field
 
+from unstructured_ingest.data_types.file_data import FileData
 from unstructured_ingest.error import DestinationConnectionError
-from unstructured_ingest.logger import logger
-from unstructured_ingest.utils.data_prep import flatten_dict
-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 (
     ConnectionConfig,
     Uploader,
     UploaderConfig,
     UploadStager,
     UploadStagerConfig,
 )
-from unstructured_ingest.v2.types.file_data import FileData
+from unstructured_ingest.logger import logger
+from unstructured_ingest.utils.constants import RECORD_ID_LABEL
+from unstructured_ingest.utils.data_prep import flatten_dict
+from unstructured_ingest.utils.dep_check import requires_dependencies
 
 CONNECTOR_TYPE = "lancedb"
 

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

@@ -2,9 +2,9 @@ from dataclasses import dataclass
 
 from pydantic import Field, Secret
 
-from unstructured_ingest.v2.interfaces.connector import AccessConfig
-from unstructured_ingest.v2.processes.connector_registry import DestinationRegistryEntry
-from unstructured_ingest.v2.processes.connectors.lancedb.lancedb import (
+from unstructured_ingest.interfaces.connector import AccessConfig
+from unstructured_ingest.processes.connector_registry import DestinationRegistryEntry
+from unstructured_ingest.processes.connectors.lancedb.lancedb import (
     LanceDBConnectionConfig,
     LanceDBUploader,
     LanceDBUploaderConfig,

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

@@ -8,7 +8,12 @@ from typing import Any, Generator
 
 from pydantic import 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,
@@ -19,20 +24,15 @@ 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,
-)
 
 CONNECTOR_TYPE = "local"
 

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

@@ -6,11 +6,9 @@ from typing import TYPE_CHECKING, Any, Generator, Optional, Union
 from dateutil import parser
 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 flatten_dict
-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,
     Uploader,
@@ -18,11 +16,13 @@ from unstructured_ingest.v2.interfaces import (
     UploadStager,
     UploadStagerConfig,
 )
-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.types.file_data import FileData
+from unstructured_ingest.utils.constants import RECORD_ID_LABEL
+from unstructured_ingest.utils.data_prep import flatten_dict
+from unstructured_ingest.utils.dep_check import requires_dependencies
 
 if TYPE_CHECKING:
     from pymilvus import MilvusClient

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

@@ -7,11 +7,15 @@ from typing import TYPE_CHECKING, Any, Generator, Optional
 from pydantic import BaseModel, Field, Secret
 
 from unstructured_ingest.__version__ import __version__ as unstructured_version
+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 batch_generator, flatten_dict
-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,
@@ -23,18 +27,14 @@ from unstructured_ingest.v2.interfaces import (
     UploaderConfig,
     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
+from unstructured_ingest.utils.dep_check import requires_dependencies
 
 if TYPE_CHECKING:
     from pymongo import MongoClient

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

@@ -11,11 +11,9 @@ from typing import TYPE_CHECKING, Any, AsyncGenerator, Literal, Optional
 
 from pydantic import BaseModel, ConfigDict, Field, Secret, field_validator
 
+from unstructured_ingest.data_types.file_data import FileData
 from unstructured_ingest.error import DestinationConnectionError
-from unstructured_ingest.logger import logger
-from unstructured_ingest.utils.data_prep import batch_generator, get_json_data
-from unstructured_ingest.utils.dep_check import requires_dependencies
-from unstructured_ingest.v2.interfaces import (
+from unstructured_ingest.interfaces import (
     AccessConfig,
     ConnectionConfig,
     Uploader,
@@ -23,11 +21,13 @@ from unstructured_ingest.v2.interfaces import (
     UploadStager,
     UploadStagerConfig,
 )
-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.utils import format_and_truncate_orig_elements
-from unstructured_ingest.v2.types.file_data import FileData
+from unstructured_ingest.processes.connectors.utils import format_and_truncate_orig_elements
+from unstructured_ingest.utils.data_prep import batch_generator, get_json_data
+from unstructured_ingest.utils.dep_check import requires_dependencies
 
 SimilarityFunction = Literal["cosine"]
 

unstructured_ingest/{v2/processes → processes}/connectors/notion/client.py

@@ -10,13 +10,13 @@ from notion_client.api_endpoints import Endpoint
 from notion_client.api_endpoints import PagesEndpoint as NotionPagesEndpoint
 from notion_client.errors import HTTPResponseError, RequestTimeoutError
 
-from unstructured_ingest.ingest_backoff import RetryHandler
-from unstructured_ingest.interfaces import RetryStrategyConfig
+from unstructured_ingest.processes.connectors.notion.ingest_backoff import RetryHandler
+from unstructured_ingest.processes.connectors.notion.ingest_backoff.types import RetryStrategyConfig
+from unstructured_ingest.processes.connectors.notion.types.block import Block
+from unstructured_ingest.processes.connectors.notion.types.database import Database
+from unstructured_ingest.processes.connectors.notion.types.database_properties import map_cells
+from unstructured_ingest.processes.connectors.notion.types.page import Page
 from unstructured_ingest.utils.dep_check import requires_dependencies
-from unstructured_ingest.v2.processes.connectors.notion.types.block import Block
-from unstructured_ingest.v2.processes.connectors.notion.types.database import Database
-from unstructured_ingest.v2.processes.connectors.notion.types.database_properties import map_cells
-from unstructured_ingest.v2.processes.connectors.notion.types.page import Page
 
 
 @requires_dependencies(["httpx"], extras="notion")

unstructured_ingest/{v2/processes → processes}/connectors/notion/connector.py

@@ -4,9 +4,13 @@ from typing import TYPE_CHECKING, Any, AsyncGenerator, Generator, Optional
 
 from pydantic import UUID4, 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,
@@ -15,16 +19,12 @@ 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
 
 if TYPE_CHECKING:
-    from unstructured_ingest.v2.processes.connectors.notion.client import Client
+    from unstructured_ingest.processes.connectors.notion.client import Client
 
 NOTION_API_VERSION = "2022-06-28"
 CONNECTOR_TYPE = "notion"
@@ -39,7 +39,7 @@ class NotionConnectionConfig(ConnectionConfig):
 
     @requires_dependencies(["notion_client"], extras="notion")
     def get_client(self) -> "Client":
-        from unstructured_ingest.v2.processes.connectors.notion.client import Client
+        from unstructured_ingest.processes.connectors.notion.client import Client
 
         return Client(
             notion_version=NOTION_API_VERSION,
@@ -222,7 +222,7 @@ class NotionIndexer(Indexer):
         processed_pages: set[str],
         processed_databases: set[str],
     ) -> tuple[set[str], set[str]]:
-        from unstructured_ingest.v2.processes.connectors.notion.helpers import (
+        from unstructured_ingest.processes.connectors.notion.helpers import (
             get_recursive_content_from_page,
         )
 
@@ -242,7 +242,7 @@ class NotionIndexer(Indexer):
         processed_pages: set[str],
         processed_databases: set[str],
     ) -> tuple[set[str], set[str]]:
-        from unstructured_ingest.v2.processes.connectors.notion.helpers import (
+        from unstructured_ingest.processes.connectors.notion.helpers import (
             get_recursive_content_from_database,
         )
 
@@ -290,7 +290,7 @@ class NotionDownloader(Downloader):
             raise ValueError("Invalid record_locator in file_data")
 
     def download_page(self, client, page_id: str, file_data: FileData) -> DownloadResponse:
-        from unstructured_ingest.v2.processes.connectors.notion.helpers import extract_page_html
+        from unstructured_ingest.processes.connectors.notion.helpers import extract_page_html
 
         try:
             text_extraction = extract_page_html(
@@ -315,7 +315,7 @@ class NotionDownloader(Downloader):
             return None
 
     def download_database(self, client, database_id: str, file_data: FileData) -> DownloadResponse:
-        from unstructured_ingest.v2.processes.connectors.notion.helpers import extract_database_html
+        from unstructured_ingest.processes.connectors.notion.helpers import extract_database_html
 
         try:
             text_extraction = extract_database_html(

unstructured_ingest/{v2/processes → processes}/connectors/notion/helpers.py

@@ -22,10 +22,10 @@ from htmlBuilder.tags import (
 )
 from notion_client.errors import APIResponseError
 
-import unstructured_ingest.v2.processes.connectors.notion.types.blocks as notion_blocks
-from unstructured_ingest.v2.processes.connectors.notion.client import Client
-from unstructured_ingest.v2.processes.connectors.notion.types.block import Block
-from unstructured_ingest.v2.processes.connectors.notion.types.database import Database
+import unstructured_ingest.processes.connectors.notion.types.blocks as notion_blocks
+from unstructured_ingest.processes.connectors.notion.client import Client
+from unstructured_ingest.processes.connectors.notion.types.block import Block
+from unstructured_ingest.processes.connectors.notion.types.database import Database
 
 
 @dataclass

unstructured_ingest/{ingest_backoff → processes/connectors/notion/ingest_backoff}/_wrapper.py

@@ -16,7 +16,11 @@ from backoff._typing import (
     _WaitGenerator,
 )
 
-from unstructured_ingest.ingest_backoff._common import _log_backoff, _log_giveup, _log_start
+from unstructured_ingest.processes.connectors.notion.ingest_backoff._common import (
+    _log_backoff,
+    _log_giveup,
+    _log_start,
+)
 
 
 class RetryHandler:

unstructured_ingest/processes/connectors/notion/ingest_backoff/types.py

@@ -0,0 +1,24 @@
+from dataclasses import dataclass
+from typing import Optional
+
+
+@dataclass
+class RetryStrategyConfig:
+    """
+    Contains all info needed for decorator to pull from `self` for backoff
+    and retry triggered by exception.
+
+    Args:
+        max_retries: The maximum number of attempts to make before giving
+            up. Once exhausted, the exception will be allowed to escape.
+            The default value of None means there is no limit to the
+            number of tries. If a callable is passed, it will be
+            evaluated at runtime and its return value used.
+        max_retry_time: The maximum total amount of time to try for before
+            giving up. Once expired, the exception will be allowed to
+            escape. If a callable is passed, it will be
+            evaluated at runtime and its return value used.
+    """
+
+    max_retries: Optional[int] = None
+    max_retry_time: Optional[float] = None

unstructured_ingest/{connector → processes/connectors}/notion/types/block.py

@@ -4,14 +4,14 @@ from typing import Optional
 
 from htmlBuilder.tags import HtmlTag
 
-from unstructured_ingest.connector.notion.interfaces import (
+from unstructured_ingest.processes.connectors.notion.interfaces import (
     BlockBase,
     FromJSONMixin,
     GetHTMLMixin,
 )
-from unstructured_ingest.connector.notion.types import blocks
-from unstructured_ingest.connector.notion.types.parent import Parent
-from unstructured_ingest.connector.notion.types.user import PartialUser
+from unstructured_ingest.processes.connectors.notion.types import blocks
+from unstructured_ingest.processes.connectors.notion.types.parent import Parent
+from unstructured_ingest.processes.connectors.notion.types.user import PartialUser
 
 block_type_mapping = {
     "bookmark": blocks.Bookmark,

unstructured_ingest/{v2/processes → processes}/connectors/notion/types/blocks/bookmark.py

@@ -5,8 +5,8 @@ from typing import List, Optional
 from htmlBuilder.attributes import Href
 from htmlBuilder.tags import A, Br, Div, HtmlTag
 
-from unstructured_ingest.connector.notion.interfaces import BlockBase
-from unstructured_ingest.connector.notion.types.rich_text import RichText
+from unstructured_ingest.processes.connectors.notion.interfaces import BlockBase
+from unstructured_ingest.processes.connectors.notion.types.rich_text import RichText
 
 
 @dataclass

unstructured_ingest/{connector → processes/connectors}/notion/types/blocks/breadcrumb.py

@@ -4,7 +4,7 @@ from typing import Optional
 
 from htmlBuilder.tags import HtmlTag
 
-from unstructured_ingest.connector.notion.interfaces import BlockBase
+from unstructured_ingest.processes.connectors.notion.interfaces import BlockBase
 
 
 @dataclass