Skip to content

Commit 9a09113

Browse files
authored
feat/drop use of old file data (#446)
* drop use of old file data * fix missing imports * fix unit tests * fix import
1 parent 14b0280 commit 9a09113

File tree

105 files changed

+223
-201
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

105 files changed

+223
-201
lines changed

CHANGELOG.md

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
## 0.6.0
2+
3+
### Features
4+
5+
* **Isolate FileData to limit dependencies**
6+
17
## 0.5.25
28

39
### Features

test/integration/connectors/databricks/test_volumes_native.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,6 @@
2121
)
2222
from test.integration.utils import requires_env
2323
from unstructured_ingest.v2.errors import UserAuthError, UserError
24-
from unstructured_ingest.v2.interfaces import FileData, SourceIdentifiers
2524
from unstructured_ingest.v2.processes.connectors.databricks.volumes_native import (
2625
CONNECTOR_TYPE,
2726
DatabricksNativeVolumesAccessConfig,
@@ -33,6 +32,7 @@
3332
DatabricksNativeVolumesUploader,
3433
DatabricksNativeVolumesUploaderConfig,
3534
)
35+
from unstructured_ingest.v2.types.file_data import FileData, SourceIdentifiers
3636

3737

3838
@dataclass

test/integration/connectors/duckdb/test_duckdb.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,14 @@
1010
StagerValidationConfigs,
1111
stager_validation,
1212
)
13-
from unstructured_ingest.v2.interfaces.file_data import FileData, SourceIdentifiers
1413
from unstructured_ingest.v2.processes.connectors.duckdb.duckdb import (
1514
CONNECTOR_TYPE,
1615
DuckDBConnectionConfig,
1716
DuckDBUploader,
1817
DuckDBUploaderConfig,
1918
DuckDBUploadStager,
2019
)
20+
from unstructured_ingest.v2.types.file_data import FileData, SourceIdentifiers
2121

2222

2323
@pytest.fixture

test/integration/connectors/duckdb/test_motherduck.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99

1010
from test.integration.connectors.utils.constants import DESTINATION_TAG, SQL_TAG
1111
from test.integration.utils import requires_env
12-
from unstructured_ingest.v2.interfaces.file_data import FileData, SourceIdentifiers
1312
from unstructured_ingest.v2.processes.connectors.duckdb.motherduck import (
1413
CONNECTOR_TYPE,
1514
MotherDuckAccessConfig,
@@ -18,6 +17,7 @@
1817
MotherDuckUploaderConfig,
1918
MotherDuckUploadStager,
2019
)
20+
from unstructured_ingest.v2.types.file_data import FileData, SourceIdentifiers
2121

2222

2323
@pytest.fixture

test/integration/connectors/elasticsearch/test_elasticsearch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
source_connector_validation,
2323
)
2424
from unstructured_ingest.error import DestinationConnectionError, SourceConnectionError
25-
from unstructured_ingest.v2.interfaces import FileData, SourceIdentifiers
25+
from unstructured_ingest.v2.types.file_data import FileData, SourceIdentifiers
2626
from unstructured_ingest.v2.processes.connectors.elasticsearch.elasticsearch import (
2727
CONNECTOR_TYPE,
2828
ElasticsearchAccessConfig,

test/integration/connectors/elasticsearch/test_opensearch.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
DestinationConnectionError,
2525
SourceConnectionError,
2626
)
27-
from unstructured_ingest.v2.interfaces import FileData, SourceIdentifiers
2827
from unstructured_ingest.v2.processes.connectors.elasticsearch.opensearch import (
2928
CONNECTOR_TYPE,
3029
OpenSearchAccessConfig,
@@ -38,6 +37,7 @@
3837
OpenSearchUploadStager,
3938
OpenSearchUploadStagerConfig,
4039
)
40+
from unstructured_ingest.v2.types.file_data import FileData, SourceIdentifiers
4141

4242
SOURCE_INDEX_NAME = "movies"
4343
DESTINATION_INDEX_NAME = "elements"

test/integration/connectors/kafka/test_kafka_cloud.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
source_connector_validation,
2020
)
2121
from test.integration.utils import requires_env
22-
from unstructured_ingest.v2.interfaces import FileData, SourceIdentifiers
2322
from unstructured_ingest.v2.logger import logger
2423
from unstructured_ingest.v2.processes.connectors.kafka.cloud import (
2524
CloudKafkaAccessConfig,
@@ -32,6 +31,7 @@
3231
CloudKafkaUploaderConfig,
3332
)
3433
from unstructured_ingest.v2.processes.connectors.kafka.local import CONNECTOR_TYPE
34+
from unstructured_ingest.v2.types.file_data import FileData, SourceIdentifiers
3535

3636

3737
@pytest.fixture

test/integration/connectors/kafka/test_kafka_local.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
source_connector_validation,
2525
)
2626
from unstructured_ingest.error import DestinationConnectionError, SourceConnectionError
27-
from unstructured_ingest.v2.interfaces import FileData, SourceIdentifiers
2827
from unstructured_ingest.v2.logger import logger
2928
from unstructured_ingest.v2.processes.connectors.kafka.local import (
3029
CONNECTOR_TYPE,
@@ -36,6 +35,7 @@
3635
LocalKafkaUploader,
3736
LocalKafkaUploaderConfig,
3837
)
38+
from unstructured_ingest.v2.types.file_data import FileData, SourceIdentifiers
3939

4040
SEED_MESSAGES = 10
4141

test/integration/connectors/sql/test_databricks_delta_tables.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414

1515
from test.integration.connectors.utils.constants import DESTINATION_TAG, SQL_TAG, env_setup_path
1616
from test.integration.utils import requires_env
17-
from unstructured_ingest.v2.interfaces import FileData, SourceIdentifiers
1817
from unstructured_ingest.v2.logger import logger
1918
from unstructured_ingest.v2.processes.connectors.sql.databricks_delta_tables import (
2019
CONNECTOR_TYPE,
@@ -24,6 +23,7 @@
2423
DatabricksDeltaTablesUploaderConfig,
2524
DatabricksDeltaTablesUploadStager,
2625
)
26+
from unstructured_ingest.v2.types.file_data import FileData, SourceIdentifiers
2727

2828
CATALOG = "utic-dev-tech-fixtures"
2929

test/integration/connectors/sql/test_postgres.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@
2020
SourceValidationConfigs,
2121
source_connector_validation,
2222
)
23-
from unstructured_ingest.v2.interfaces import FileData, SourceIdentifiers
2423
from unstructured_ingest.v2.processes.connectors.sql.postgres import (
2524
CONNECTOR_TYPE,
2625
PostgresAccessConfig,
@@ -32,6 +31,7 @@
3231
PostgresUploader,
3332
PostgresUploadStager,
3433
)
34+
from unstructured_ingest.v2.types.file_data import FileData, SourceIdentifiers
3535

3636
SEED_DATA_ROWS = 10
3737

0 commit comments

Comments
 (0)