From 90c7de700c17a1fe95ce60fc490dfa3a235cf27a Mon Sep 17 00:00:00 2001 From: Mateusz Kuprowski Date: Thu, 13 Mar 2025 14:18:50 +0100 Subject: [PATCH 1/8] Probable fix to zendesk source register --- .../v2/processes/connectors/__init__.py | 3 ++ .../processes/connectors/zendesk/__init__.py | 29 ------------------- 2 files changed, 3 insertions(+), 29 deletions(-) diff --git a/unstructured_ingest/v2/processes/connectors/__init__.py b/unstructured_ingest/v2/processes/connectors/__init__.py index f55c727ab..bdb6e1baf 100644 --- a/unstructured_ingest/v2/processes/connectors/__init__.py +++ b/unstructured_ingest/v2/processes/connectors/__init__.py @@ -64,6 +64,8 @@ from .slack import slack_source_entry from .vectara import CONNECTOR_TYPE as VECTARA_CONNECTOR_TYPE from .vectara import vectara_destination_entry +from .zendesk.zendesk import CONNECTOR_TYPE as ZENDESK_CONNECTOR_TYPE +from .zendesk.zendesk import zendesk_source_entry add_source_entry(source_type=ASTRA_DB_CONNECTOR_TYPE, entry=astra_db_source_entry) add_destination_entry(destination_type=ASTRA_DB_CONNECTOR_TYPE, entry=astra_db_destination_entry) @@ -119,3 +121,4 @@ add_destination_entry(destination_type=REDIS_CONNECTOR_TYPE, entry=redis_destination_entry) add_source_entry(source_type=JIRA_CONNECTOR_TYPE, entry=jira_source_entry) +add_source_entry(source_type=ZENDESK_CONNECTOR_TYPE, entry=zendesk_source_entry) diff --git a/unstructured_ingest/v2/processes/connectors/zendesk/__init__.py b/unstructured_ingest/v2/processes/connectors/zendesk/__init__.py index 86bcaa3aa..139597f9c 100644 --- a/unstructured_ingest/v2/processes/connectors/zendesk/__init__.py +++ b/unstructured_ingest/v2/processes/connectors/zendesk/__init__.py @@ -1,31 +1,2 @@ -from unstructured_ingest.v2.processes.connector_registry import ( - add_source_entry, -) -from .zendesk import ( - CONNECTOR_TYPE, - ZendeskAccessConfig, - ZendeskClient, - ZendeskConnectionConfig, - ZendeskDownloader, - ZendeskDownloaderConfig, - ZendeskIndexer, - ZendeskIndexerConfig, - ZendeskTicket, - zendesk_source_entry, -) -__all__ = [ - "add_source_entry", - "zendesk_source_entry", - "ZendeskAccessConfig", - "ZendeskClient", - "ZendeskConnectionConfig", - "ZendeskDownloader", - "ZendeskDownloaderConfig", - "ZendeskIndexer", - "ZendeskIndexerConfig", - "ZendeskTicket", -] - -add_source_entry(source_type=CONNECTOR_TYPE, entry=zendesk_source_entry) From 717d6dc63e9700db6795d14085a4d5476e678478 Mon Sep 17 00:00:00 2001 From: Mateusz Kuprowski Date: Thu, 13 Mar 2025 14:21:25 +0100 Subject: [PATCH 2/8] Version bump --- CHANGELOG.md | 6 ++++++ unstructured_ingest/__version__.py | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/CHANGELOG.md b/CHANGELOG.md index ebf7cca55..d110deb11 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,3 +1,9 @@ +## 0.5.14 + +### Fixes + +* **Fixed Zendesk connector registering method** + ## 0.5.13 ### Fixes diff --git a/unstructured_ingest/__version__.py b/unstructured_ingest/__version__.py index d4f2e2f59..a2aded605 100644 --- a/unstructured_ingest/__version__.py +++ b/unstructured_ingest/__version__.py @@ -1 +1 @@ -__version__ = "0.5.13" # pragma: no cover +__version__ = "0.5.14" # pragma: no cover From 55e67e7529f286aa69433d6d569f69f0f68b5e0a Mon Sep 17 00:00:00 2001 From: Mateusz Kuprowski Date: Thu, 13 Mar 2025 14:23:44 +0100 Subject: [PATCH 3/8] Linter fix --- unstructured_ingest/v2/processes/connectors/zendesk/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/unstructured_ingest/v2/processes/connectors/zendesk/__init__.py b/unstructured_ingest/v2/processes/connectors/zendesk/__init__.py index 139597f9c..8b1378917 100644 --- a/unstructured_ingest/v2/processes/connectors/zendesk/__init__.py +++ b/unstructured_ingest/v2/processes/connectors/zendesk/__init__.py @@ -1,2 +1 @@ - From 3cbe0bd2040876a959b8f1fc600c413fda1beffa Mon Sep 17 00:00:00 2001 From: Mateusz Kuprowski Date: Thu, 13 Mar 2025 14:28:26 +0100 Subject: [PATCH 4/8] Fixed init --- unstructured_ingest/v2/processes/connectors/zendesk/__init__.py | 1 - 1 file changed, 1 deletion(-) diff --git a/unstructured_ingest/v2/processes/connectors/zendesk/__init__.py b/unstructured_ingest/v2/processes/connectors/zendesk/__init__.py index 8b1378917..e69de29bb 100644 --- a/unstructured_ingest/v2/processes/connectors/zendesk/__init__.py +++ b/unstructured_ingest/v2/processes/connectors/zendesk/__init__.py @@ -1 +0,0 @@ - From 9ed3c98dac0d4cae4ad619814fc92b3f0411ad44 Mon Sep 17 00:00:00 2001 From: Mateusz Kuprowski Date: Thu, 13 Mar 2025 14:33:53 +0100 Subject: [PATCH 5/8] Fixing integration test --- test/integration/connectors/test_zendesk.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/integration/connectors/test_zendesk.py b/test/integration/connectors/test_zendesk.py index e11d493cf..66f800b62 100644 --- a/test/integration/connectors/test_zendesk.py +++ b/test/integration/connectors/test_zendesk.py @@ -11,7 +11,7 @@ ) from test.integration.utils import requires_env from unstructured_ingest.v2.errors import UserAuthError -from unstructured_ingest.v2.processes.connectors.zendesk import ( +from unstructured_ingest.v2.processes.connectors.zendesk.zendesk import ( CONNECTOR_TYPE, ZendeskAccessConfig, ZendeskConnectionConfig, From 6811ce217fe8262259ef1c2c14c37835cdfea6ce Mon Sep 17 00:00:00 2001 From: Mateusz Kuprowski Date: Tue, 18 Mar 2025 11:35:40 +0100 Subject: [PATCH 6/8] Move Zendesk source definition into module --- unstructured_ingest/v2/processes/connectors/__init__.py | 1 - .../v2/processes/connectors/zendesk/__init__.py | 7 +++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/unstructured_ingest/v2/processes/connectors/__init__.py b/unstructured_ingest/v2/processes/connectors/__init__.py index bdb6e1baf..f88b9f0ad 100644 --- a/unstructured_ingest/v2/processes/connectors/__init__.py +++ b/unstructured_ingest/v2/processes/connectors/__init__.py @@ -121,4 +121,3 @@ add_destination_entry(destination_type=REDIS_CONNECTOR_TYPE, entry=redis_destination_entry) add_source_entry(source_type=JIRA_CONNECTOR_TYPE, entry=jira_source_entry) -add_source_entry(source_type=ZENDESK_CONNECTOR_TYPE, entry=zendesk_source_entry) diff --git a/unstructured_ingest/v2/processes/connectors/zendesk/__init__.py b/unstructured_ingest/v2/processes/connectors/zendesk/__init__.py index e69de29bb..b744e0199 100644 --- a/unstructured_ingest/v2/processes/connectors/zendesk/__init__.py +++ b/unstructured_ingest/v2/processes/connectors/zendesk/__init__.py @@ -0,0 +1,7 @@ +from unstructured_ingest.v2.processes.connector_registry import ( + add_source_entry, +) +from .zendesk import CONNECTOR_TYPE as ZENDESK_CONNECTOR_TYPE +from .zendesk import zendesk_source_entry + +add_source_entry(source_type=ZENDESK_CONNECTOR_TYPE, entry=zendesk_source_entry) \ No newline at end of file From d49b590594859a22691544587cdefbb507973968 Mon Sep 17 00:00:00 2001 From: Mateusz Kuprowski Date: Tue, 18 Mar 2025 13:31:07 +0100 Subject: [PATCH 7/8] Added future annotations Moved source entry into the module --- unstructured_ingest/v2/processes/connectors/__init__.py | 1 - unstructured_ingest/v2/processes/connectors/zendesk/__init__.py | 2 ++ 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/unstructured_ingest/v2/processes/connectors/__init__.py b/unstructured_ingest/v2/processes/connectors/__init__.py index bdb6e1baf..f88b9f0ad 100644 --- a/unstructured_ingest/v2/processes/connectors/__init__.py +++ b/unstructured_ingest/v2/processes/connectors/__init__.py @@ -121,4 +121,3 @@ add_destination_entry(destination_type=REDIS_CONNECTOR_TYPE, entry=redis_destination_entry) add_source_entry(source_type=JIRA_CONNECTOR_TYPE, entry=jira_source_entry) -add_source_entry(source_type=ZENDESK_CONNECTOR_TYPE, entry=zendesk_source_entry) diff --git a/unstructured_ingest/v2/processes/connectors/zendesk/__init__.py b/unstructured_ingest/v2/processes/connectors/zendesk/__init__.py index b744e0199..6be9ec0c9 100644 --- a/unstructured_ingest/v2/processes/connectors/zendesk/__init__.py +++ b/unstructured_ingest/v2/processes/connectors/zendesk/__init__.py @@ -1,3 +1,5 @@ +from __future__ import annotations + from unstructured_ingest.v2.processes.connector_registry import ( add_source_entry, ) From 6bf258ebb662575b72ed23a34e47dd9f3b01afb5 Mon Sep 17 00:00:00 2001 From: Mateusz Kuprowski Date: Tue, 18 Mar 2025 13:40:21 +0100 Subject: [PATCH 8/8] Linter fixes --- unstructured_ingest/v2/processes/connectors/__init__.py | 2 -- .../v2/processes/connectors/zendesk/__init__.py | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/unstructured_ingest/v2/processes/connectors/__init__.py b/unstructured_ingest/v2/processes/connectors/__init__.py index f88b9f0ad..f55c727ab 100644 --- a/unstructured_ingest/v2/processes/connectors/__init__.py +++ b/unstructured_ingest/v2/processes/connectors/__init__.py @@ -64,8 +64,6 @@ from .slack import slack_source_entry from .vectara import CONNECTOR_TYPE as VECTARA_CONNECTOR_TYPE from .vectara import vectara_destination_entry -from .zendesk.zendesk import CONNECTOR_TYPE as ZENDESK_CONNECTOR_TYPE -from .zendesk.zendesk import zendesk_source_entry add_source_entry(source_type=ASTRA_DB_CONNECTOR_TYPE, entry=astra_db_source_entry) add_destination_entry(destination_type=ASTRA_DB_CONNECTOR_TYPE, entry=astra_db_destination_entry) diff --git a/unstructured_ingest/v2/processes/connectors/zendesk/__init__.py b/unstructured_ingest/v2/processes/connectors/zendesk/__init__.py index 6be9ec0c9..d4d7be17e 100644 --- a/unstructured_ingest/v2/processes/connectors/zendesk/__init__.py +++ b/unstructured_ingest/v2/processes/connectors/zendesk/__init__.py @@ -3,7 +3,8 @@ from unstructured_ingest.v2.processes.connector_registry import ( add_source_entry, ) + from .zendesk import CONNECTOR_TYPE as ZENDESK_CONNECTOR_TYPE from .zendesk import zendesk_source_entry -add_source_entry(source_type=ZENDESK_CONNECTOR_TYPE, entry=zendesk_source_entry) \ No newline at end of file +add_source_entry(source_type=ZENDESK_CONNECTOR_TYPE, entry=zendesk_source_entry)