dc-python-sdk 1.5.11__tar.gz → 1.5.13__tar.gz

{dc_python_sdk-1.5.11/src/dc_python_sdk.egg-info → dc_python_sdk-1.5.13}/PKG-INFO

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

{dc_python_sdk-1.5.11 → dc_python_sdk-1.5.13}/pyproject.toml

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

{dc_python_sdk-1.5.11 → dc_python_sdk-1.5.13}/setup.cfg

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

{dc_python_sdk-1.5.11 → dc_python_sdk-1.5.13/src/dc_python_sdk.egg-info}/PKG-INFO

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

{dc_python_sdk-1.5.11 → dc_python_sdk-1.5.13}/src/dc_sdk/cli.py

@@ -10,7 +10,7 @@ def main():
     print(f"[DC SDK] Command: {command}")
 
     if command == "http":
-        from dc_sdk.server import start_server
+        from dc_sdk.src.server import start_server
         start_server()
 
     else:

{dc_python_sdk-1.5.11 → dc_python_sdk-1.5.13}/src/dc_sdk/errors.py

@@ -11,6 +11,17 @@ class Error(Exception):
     def __str__(self):
         return self.error_name + self.message
 
+    def to_dict(self):
+        return {
+            "error": self.message,
+            "error_class": self.__class__.__name__,
+            "internal_error": self.internal,
+            "args": {
+                k: v for k, v in self.__dict__.items()
+                if k not in ["error_name", "internal"]
+            }
+        }
+
 
 class AuthenticationError(Error):
     error_name = "Authentication Error - "
@@ -24,6 +35,7 @@ class AuthenticationError(Error):
 
             :param message: An error message - WILL BE VISIBLE TO CLIENT
         """
+        super().__init__(message, self.error_name, self.internal)
         self.message = message
         self.error_name = "Authentication Error - "
         self.internal = False
@@ -36,8 +48,8 @@ class WhitelistError(Error):
     internal = False
 
     def __init__(self, message=None):
+        super().__init__(message, self.error_name, self.internal)
         self.message = message
-        self.error_name = "Whitelist Error - "
         self.internal = False
 
 
@@ -47,6 +59,7 @@ class NoObjectsFoundError(Error):
     internal = False
 
     def __init__(self, message=None):
+        super().__init__(message, self.error_name, self.internal)
         self.message = message
         self.error_name = "No Objects Found Error - "
         self.internal = False
@@ -59,6 +72,7 @@ class GetObjectsError(Error):
     internal = False
 
     def __init__(self, message=None):
+        super().__init__(message, self.error_name, self.internal)
         self.message = message
         self.error_name = "Get Objects Error - "
         self.internal = False
@@ -70,6 +84,7 @@ class NoFieldsFoundError(Error):
     internal = False
 
     def __init__(self, object_id, message=None):
+        super().__init__(message, self.error_name, self.internal)
         self.object_id = object_id
         self.message = message
         self.error_name = "No Fields Found Error - "
@@ -90,6 +105,7 @@ class GetFieldsError(Error):
     internal = False
 
     def __init__(self, object_id, message=None):
+        super().__init__(message, self.error_name, self.internal)
         self.object_id = object_id
         self.message = message
         self.error_name = "Get Fields Error - "
@@ -109,6 +125,7 @@ class BadFieldIDError(Error):
     internal = True
 
     def __init__(self, field_id=None, object_id=None, message=None):
+        super().__init__(message, self.error_name, self.internal)
         self.field_id = field_id
         self.object_id = object_id
         self.message = message
@@ -130,6 +147,7 @@ class FilterDataTypeError(Error):
     internal = True
 
     def __init__(self, datatype=None, field_to_filter=None, message=None):
+        super().__init__(message, self.error_name, self.internal)
         self.datatype = datatype
         self.field = field_to_filter
         self.message = message
@@ -150,6 +168,7 @@ class BadObjectIDError(Error):
     internal = True
 
     def __init__(self, object_id=None, message=None):
+        super().__init__(message, self.error_name, self.internal)
         self.object_id = object_id
         self.message = message
         self.error_name = "Bad Object ID Error - "
@@ -169,6 +188,7 @@ class UpdateMethodNotSupportedError(Error):
     internal = True
 
     def __init__(self, update_method=None, connector=None, message=None):
+        super().__init__(message, self.error_name, self.internal)
         self.update_method = update_method
         self.connector = connector
         self.message = message
@@ -189,6 +209,7 @@ class MappingError(Error):
     internal = True
 
     def __init__(self, message):
+        super().__init__(message, self.error_name, self.internal)
         self.message = message
         self.error_name = "Mapping Error - "
         self.internal = False
@@ -200,6 +221,7 @@ class DataError(Error):
     internal = True
 
     def __init__(self, message):
+        super().__init__(message, self.error_name, self.internal)
         self.message = message
         self.error_name = "Data Error - "
         self.internal = False
@@ -211,6 +233,7 @@ class APIRequestError(Error):
     internal = True
 
     def __init__(self, error_code_returned=None, message=None):
+        super().__init__(message, self.error_name, self.internal)
         self.error_code = error_code_returned
         self.message = message
         self.error_name = "API Request Error - "
@@ -229,6 +252,7 @@ class APITimeoutError(Error):
     internal = True
 
     def __init__(self, message=None):
+        super().__init__(message, self.error_name, self.internal)
         self.message = message
         self.error_name = "API Timeout Error - "
         self.internal = False
@@ -240,6 +264,7 @@ class FieldDataTypeError(Error):
     internal = True
 
     def __init__(self, datatype=None, field=None, message=None):
+        super().__init__(message, self.error_name, self.internal)
         self.datatype = datatype
         self.field = field
         self.message = message
@@ -260,6 +285,7 @@ class APIPermissionError(Error):
     internal = True
 
     def __init__(self, message=None):
+        super().__init__(message, self.error_name, self.internal)
         self.message = message
         self.error_name = "API Permission Error - "
         self.internal = False
@@ -270,7 +296,8 @@ class LoadDataError(Error):
     error_name = "Load Data Error - "
     internal = True
 
-    def __init__(self, message=None):
+    def __init__(self, message=None):   
+        super().__init__(message, self.error_name, self.internal)
         self.message = message
         self.error_name = "Load Data Error - "
         self.internal = False
@@ -282,6 +309,7 @@ class NotADestinationError(Error):
     internal = True
 
     def __init__(self, message=None):
+        super().__init__(message, self.error_name, self.internal)
         self.message = message
         self.error_name = "Not A Destination Error - "
         self.internal = True
@@ -294,6 +322,7 @@ class NotImplementedError(Error):
     internal = True
 
     def __init__(self, message=None):
+        super().__init__(message, self.error_name, self.internal)
         self.message = message
         self.error_name = "Not Implemented Error - "
         self.internal = True
@@ -305,6 +334,7 @@ class NoRowsFoundError(Error):
     internal = True
 
     def __init__(self, message=None):
+        super().__init__(message, self.error_name, self.internal)
         self.message = message
         self.error_name = "No Rows Found Error - "
         self.internal = True
@@ -322,3 +352,25 @@ def external_errors():
             error_list.append(error.__name__)
     return error_list
 
+ERROR_MAPPING = {
+    "AuthenticationError": AuthenticationError,
+    "WhitelistError": WhitelistError,
+    "NoObjectsFoundError": NoObjectsFoundError,
+    "GetObjectsError": GetObjectsError,
+    "NoFieldsFoundError": NoFieldsFoundError,
+    "GetFieldsError": GetFieldsError,
+    "BadFieldIDError": BadFieldIDError,
+    "FilterDataTypeError": FilterDataTypeError,
+    "BadObjectIDError": BadObjectIDError,
+    "UpdateMethodNotSupportedError": UpdateMethodNotSupportedError,
+    "MappingError": MappingError,
+    "DataError": DataError,
+    "APIRequestError": APIRequestError,
+    "APITimeoutError": APITimeoutError,
+    "FieldDataTypeError": FieldDataTypeError,
+    "APIPermissionError": APIPermissionError,
+    "LoadDataError": LoadDataError,
+    "NotADestinationError": NotADestinationError,
+    "NotImplementedError": NotImplementedError,
+    "NoRowsFoundError": NoRowsFoundError,
+}

{dc_python_sdk-1.5.11 → dc_python_sdk-1.5.13}/src/dc_sdk/src/server.py

@@ -3,9 +3,9 @@ from pydantic import BaseModel
 from typing import Optional, Dict, Any
 import traceback
 import os
-from dc_sdk.src.services.loader import load_connector
+from .services.loader import load_connector
 from dc_sdk.errors import Error
-from dc_sdk.src.services.session import create_session, get_session
+from .services.session import create_session, get_session
 
 app = FastAPI()
 
@@ -26,6 +26,7 @@ def invoke(req: InvokeRequest):
     result = None
     message = None
     error = None
+    error_dict = {}
     internal_error = False
     session_id = req.session_id
 
@@ -67,6 +68,7 @@ def invoke(req: InvokeRequest):
         message = e.message
         internal_error = e.internal
         error = traceback.format_exc()
+        error_dict = e.to_dict()
 
     except Exception:
         error = traceback.format_exc()
@@ -79,15 +81,14 @@ def invoke(req: InvokeRequest):
         "message": message if not internal_error else "Something went wrong",
         "results": result,
         "session_id": session_id,
-        "error": error,
-        "internal_error": internal_error
+        **error_dict
     }
 
 
 def start_server():
     import uvicorn
     uvicorn.run(
-        "dc_sdk.server:app",
+        "dc_sdk.src.server:app",
         host="0.0.0.0",
         port=int(os.getenv("PORT", 5000))
     )