dc-python-sdk 1.5.48__tar.gz → 1.5.49__tar.gz

{dc_python_sdk-1.5.48/src/dc_python_sdk.egg-info → dc_python_sdk-1.5.49}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dc-python-sdk
-Version: 1.5.48
+Version: 1.5.49
 Summary: Data Connector Python SDK
 Home-page: https://github.com/data-connector/dc-python-sdk
 Author: DataConnector

{dc_python_sdk-1.5.48 → dc_python_sdk-1.5.49}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "setuptools.build_meta"
 
 [project]
 name = "dc-python-sdk"
-version = "1.5.48"
+version = "1.5.49"
 description = "Data Connector Python SDK"
 readme = "README.md"
 requires-python = ">=3.6"

{dc_python_sdk-1.5.48 → dc_python_sdk-1.5.49}/setup.cfg

@@ -1,6 +1,6 @@
 [metadata]
 name = dc-python-sdk
-version = 1.5.48
+version = 1.5.49
 author = DataConnector
 author_email = josh@dataconnector.com
 description = A small example package

{dc_python_sdk-1.5.48 → dc_python_sdk-1.5.49/src/dc_python_sdk.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dc-python-sdk
-Version: 1.5.48
+Version: 1.5.49
 Summary: Data Connector Python SDK
 Home-page: https://github.com/data-connector/dc-python-sdk
 Author: DataConnector

{dc_python_sdk-1.5.48 → dc_python_sdk-1.5.49}/src/dc_python_sdk.egg-info/SOURCES.txt

@@ -17,6 +17,7 @@ src/dc_sdk/types.py
 src/dc_sdk/src/__init__.py
 src/dc_sdk/src/ai.py
 src/dc_sdk/src/ai_http.py
+src/dc_sdk/src/connection_status.py
 src/dc_sdk/src/mapping.py
 src/dc_sdk/src/pipeline.py
 src/dc_sdk/src/server.py

{dc_python_sdk-1.5.48 → dc_python_sdk-1.5.49}/src/dc_sdk/cli.py

@@ -18,8 +18,6 @@ def main():
 
     print("version: ", version("dc-python-sdk"))
 
-    print(f"[DC SDK] Command: {command}")
-
     if command == "http":
         from dc_sdk.src.server import start_server
         start_server()

{dc_python_sdk-1.5.48 → dc_python_sdk-1.5.49}/src/dc_sdk/handler.py

@@ -1,5 +1,6 @@
 from dc_sdk.errors import Error
 from dc_sdk.src.mapping import Mapping
+from dc_sdk.src.connection_status import STATUS_ERROR
 import traceback
 from importlib.metadata import version
 
@@ -9,7 +10,9 @@ def get_action_name(action: int) -> str:
         1: "retrieving fields",
         2: "retrieving 5 row preview",
         3: "testing connection",
-        4: "starting the connector"
+        4: "starting the connector",
+        5: "retrieving metadata",
+        6: "retrieving objects",
     }[action]
 
 def apply_data_filters(results, data_filters):
@@ -159,6 +162,9 @@ def handler(event, context):
     mapping = None
     action = int(event['action']) if 'action' in event else 4
     get_objects = event.get('get_objects', True)
+    skip_authenticate = event.get('skip_authenticate', False)
+    force_authenticate = event.get('force_authenticate', False)
+    include_metadata = event.get('include_metadata', True)
     credentials_dict = event['credentials'] if 'credentials' in event else None
     object_id = event['object_id'] if 'object_id' in event else None
     field_ids = event['mapping'] if 'mapping' in event else None
@@ -174,9 +180,14 @@ def handler(event, context):
 
         if action == 0:
             if get_objects:
-                results, message = mapping.connect_get_objects()
+                results, message = mapping.connect_get_objects(
+                    skip_authenticate=skip_authenticate,
+                    force_authenticate=force_authenticate,
+                )
             else:
-                results, message = mapping.authenticate()
+                results, message = mapping.authenticate(
+                    force_authenticate=force_authenticate or not skip_authenticate,
+                )
         elif action == 1:
             results, message = mapping.get_fields(object_id, options)
         elif action == 2:
@@ -185,6 +196,17 @@ def handler(event, context):
             results = apply_data_filters(results, data_filters)
         elif action == 3:
             results, message = mapping.test_connection()
+        elif action == 5:
+            results, message = mapping.get_metadata_only(
+                skip_authenticate=skip_authenticate,
+                force_authenticate=force_authenticate,
+            )
+        elif action == 6:
+            results, message = mapping.get_objects_only(
+                skip_authenticate=skip_authenticate,
+                force_authenticate=force_authenticate,
+                include_metadata=include_metadata,
+            )
         else:
             raise Error("Invalid action", "InvalidActionError")
     except Error as e:
@@ -192,19 +214,28 @@ def handler(event, context):
         internal_error = e.internal
         error_trace = traceback.format_exc()
         error = error_trace
+        if mapping:
+            mapping._set_connection_status(STATUS_ERROR)
 
     except Exception as e:
         error_trace = traceback.format_exc()
         error = error_trace
         internal_error = True
+        if mapping:
+            mapping._set_connection_status(STATUS_ERROR)
 
     if error:
         print(error)
 
+    last_status_dsc = None
+    if mapping and mapping.connector.credentials:
+        last_status_dsc = mapping.connector.credentials.get("last_status_dsc")
+
     return {
         'message': message if not internal_error else f"Something went wrong with {action_name}",
         'results': results,
         'credentials': mapping.connector.credentials if mapping else None,
+        'last_status_dsc': last_status_dsc,
         'error': error,
         'internal_error': internal_error
     }

dc_python_sdk-1.5.49/src/dc_sdk/src/connection_status.py

@@ -0,0 +1,34 @@
+STATUS_CONNECTED = "Connected"
+STATUS_ERROR = "Error"
+STATUS_UNKNOWN = "Unknown"
+STATUS_NOT_SETUP = "NotSetup"
+STATUS_PENDING = "Pending"
+
+
+def normalize_status(status):
+    if not status:
+        return STATUS_UNKNOWN
+
+    normalized = str(status).strip()
+    lowered = normalized.lower()
+
+    if lowered in ("connected", "success"):
+        return STATUS_CONNECTED
+    if lowered in ("error", "failed", "failed to connect"):
+        return STATUS_ERROR
+    if lowered in ("notsetup", "not_setup", "not setup"):
+        return STATUS_NOT_SETUP
+    if lowered == "pending":
+        return STATUS_PENDING
+    if lowered == "unknown":
+        return STATUS_UNKNOWN
+
+    return normalized
+
+
+def should_skip_authenticate(status):
+    return normalize_status(status) == STATUS_CONNECTED
+
+
+def status_from_authenticated(authenticated):
+    return STATUS_CONNECTED if authenticated else STATUS_ERROR

dc_python_sdk-1.5.49/src/dc_sdk/src/mapping.py

@@ -0,0 +1,191 @@
+from dc_sdk import errors
+import logging
+from dc_sdk.src.services.loader import load_connector
+from dc_sdk.src.connection_status import (
+    STATUS_CONNECTED,
+    STATUS_ERROR,
+    should_skip_authenticate,
+)
+
+logger = logging.getLogger(__name__)
+
+
+class Mapping():
+    def __init__(self, credentials):
+        Connector = load_connector()
+        self.connector = Connector(credentials)
+
+    def _set_connection_status(self, status):
+        if self.connector.credentials is None:
+            self.connector.credentials = {}
+        self.connector.credentials["last_status_dsc"] = status
+
+    def _initialize_connector_session(self):
+        init = getattr(self.connector, "ensure_initialized", None)
+        if callable(init):
+            init()
+            return
+
+        legacy_init = getattr(self.connector, "_ensure_initialized", None)
+        if callable(legacy_init):
+            legacy_init()
+            return
+
+        if not self.connector.authenticate():
+            raise errors.AuthenticationError(message="Failed to initialize connection session")
+
+    def _ensure_session(self, force_authenticate=False):
+        credentials = self.connector.credentials or {}
+        status = credentials.get("last_status_dsc")
+
+        if not force_authenticate and should_skip_authenticate(status):
+            try:
+                self._initialize_connector_session()
+                return True
+            except Exception:
+                self._set_connection_status(STATUS_ERROR)
+                raise
+
+        if self.connector.authenticate():
+            self._set_connection_status(STATUS_CONNECTED)
+            return True
+
+        self._set_connection_status(STATUS_ERROR)
+        raise errors.AuthenticationError(message="Failed to authenticate")
+
+    def _resolve_session(self, skip_authenticate=False, force_authenticate=False):
+        if force_authenticate:
+            self._ensure_session(force_authenticate=True)
+            return
+
+        credentials = self.connector.credentials or {}
+        status = credentials.get("last_status_dsc")
+
+        if skip_authenticate and should_skip_authenticate(status):
+            self._ensure_session(force_authenticate=False)
+            return
+
+        if skip_authenticate and not should_skip_authenticate(status):
+            self._ensure_session(force_authenticate=True)
+            return
+
+        self._ensure_session(force_authenticate=False)
+
+    def _safe_get_metadata(self):
+        try:
+            return self.connector.get_metadata()
+        except errors.NotImplementedError:
+            return None
+        except Exception:
+            logger.exception("Error getting metadata")
+            return None
+
+    def authenticate(self, force_authenticate=True):
+        results = None
+        message = None
+
+        self._ensure_session(force_authenticate=force_authenticate)
+
+        metadata = self._safe_get_metadata()
+        results = {
+            "metadata": metadata
+        }
+        message = "Authenticated successfully"
+
+        return [results, message]
+
+    def connect_get_objects(self, skip_authenticate=False, force_authenticate=False):
+        results = None
+        metadata = None
+        objects = None
+        message = None
+
+        self._resolve_session(
+            skip_authenticate=skip_authenticate,
+            force_authenticate=force_authenticate,
+        )
+
+        objects = self.connector.get_objects()
+        metadata = self._safe_get_metadata()
+
+        results = {
+            "metadata": metadata,
+            "objects": objects,
+        }
+        message = "Retrieved objects"
+
+        return [results, message]
+
+    def get_metadata_only(self, skip_authenticate=False, force_authenticate=False):
+        self._resolve_session(
+            skip_authenticate=skip_authenticate,
+            force_authenticate=force_authenticate,
+        )
+
+        metadata = self._safe_get_metadata()
+        return [{"metadata": metadata}, "Retrieved metadata"]
+
+    def get_objects_only(self, skip_authenticate=False, force_authenticate=False, include_metadata=True):
+        self._resolve_session(
+            skip_authenticate=skip_authenticate,
+            force_authenticate=force_authenticate,
+        )
+
+        objects = self.connector.get_objects()
+        results = {"objects": objects}
+
+        if include_metadata:
+            results["metadata"] = self._safe_get_metadata()
+
+        return [results, "Retrieved objects"]
+
+    def test_connection(self):
+        results = None
+        message = None
+
+        self._ensure_session(force_authenticate=True)
+        message = "Authenticated successfully"
+
+        return [results, message]
+
+    def get_fields(self, object_id, options):
+        results = None
+        message = None
+        self._ensure_session(force_authenticate=False)
+        results = self.connector.get_fields(object_id, options=options)
+        message = "Retrieved fields"
+
+        return [results, message]
+
+    def get_five_row_preview(self, object_id, field_ids, options, n_rows=5, filters=None, next_page=None):
+        results = None
+        message = None
+
+        self._ensure_session(force_authenticate=False)
+        results = self.connector.get_data(
+            object_id,
+            field_ids=field_ids,
+            n_rows=n_rows,
+            filters=filters,
+            next_page=next_page,
+            options=options,
+        )
+        message = "Retrieved 5 row preview"
+
+        return [results, message]
+
+    def get_data(self, object_id, field_ids, n_rows, next_page, options):
+        results = None
+        message = None
+
+        self._ensure_session(force_authenticate=False)
+        results = self.connector.get_data(
+            object_id,
+            field_ids=field_ids,
+            n_rows=n_rows,
+            next_page=next_page,
+            options=options,
+        )
+        message = "Retrieved data"
+
+        return [results, message]

dc_python_sdk-1.5.48/src/dc_sdk/src/mapping.py

@@ -1,109 +0,0 @@
-from dc_sdk import errors
-import logging
-from dc_sdk.src.services.loader import load_connector
-
-logger = logging.getLogger(__name__)
-class Mapping():
-    def __init__(self, credentials):
-        Connector = load_connector()
-        self.connector = Connector(credentials)
-
-    def authenticate(self):
-        results = None
-        metadata = None
-        message = None
-
-        if self.connector.authenticate():
-            try:
-                metadata = self.connector.get_metadata()
-            except errors.NotImplementedError:
-                pass
-            except:
-                logger.exception("Error getting metadata")
-
-            results = {
-                'metadata': metadata
-            }
-
-            message = "Authenticated successfully"
-        else:
-            raise errors.AuthenticationError(message="Failed to authenticate")
-
-        return [results, message]
-
-    def connect_get_objects(self):
-        results = None
-        metadata = None
-        objects = None
-        message = None
-
-        if self.connector.authenticate():
-            objects = self.connector.get_objects()
-            try:
-                metadata = self.connector.get_metadata()
-            except errors.NotImplementedError:
-                pass
-            except Exception as e:
-                print("Error getting metadata")
-                print(str(e))
-
-            results = {
-                'metadata': metadata,
-                'objects': objects,
-            }
-            message = "Authenticated successfully"
-        else:
-            # If not authenticated, raise the authentication error.
-            raise errors.AuthenticationError(message="Failed to authenticate")
-
-        return [results, message]
-        
-    def test_connection(self):
-        results = None
-        message = None
-
-        if self.connector.authenticate():
-            message = "Authenticated successfully"
-        else:
-            # If not authenticated, raise the authentication error.
-            raise errors.AuthenticationError(message="Failed to authenticate")
-
-        return [results, message]
-
-    def get_fields(self, object_id, options):
-        results = None
-        message = None
-        if self.connector.authenticate():
-            results = self.connector.get_fields(object_id, options=options)
-            message = "Retrieved fields"
-        else:
-            # If not authenticated, raise the authentication error.
-            raise errors.AuthenticationError("Failed to authenticate")
-
-        return [results, message]
-
-    def get_five_row_preview(self, object_id, field_ids, options, n_rows = 5, filters = None, next_page = None):
-        results = None
-        message = None
-
-        if self.connector.authenticate():
-            results = self.connector.get_data(object_id, field_ids=field_ids, n_rows=n_rows, filters=filters, next_page=next_page, options=options)
-            message = "Retrieved 5 row preview"
-        else:
-            # If not authenticated, raise the authentication error.
-            raise errors.AuthenticationError("Failed to authenticate")
-
-        return [results, message]
-
-    def get_data(self, object_id, field_ids, n_rows, next_page, options):
-        results = None
-        message = None
-
-        if self.connector.authenticate():
-            results = self.connector.get_data(object_id, field_ids=field_ids, n_rows=n_rows, next_page=next_page, options=options)
-            message = "Retrieved data"
-        else:
-            # If not authenticated, raise the authentication error.
-            raise errors.AuthenticationError("Failed to authenticate")
-
-        return [results, message]