pysodafair 0.1.65__tar.gz → 0.1.67__tar.gz

{pysodafair-0.1.65 → pysodafair-0.1.67}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pysodafair
-Version: 0.1.65
+Version: 0.1.67
 Summary: Pysoda package for Fairdataihub tools
 License: MIT
 License-File: LICENSE

{pysodafair-0.1.65 → pysodafair-0.1.67}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "pysodafair"
-version = "0.1.65"
+version = "0.1.67"
 description = "Pysoda package for Fairdataihub tools"
 authors = ["Christopher Marroquin <cmarroquin@calmi2.org>"]
 license = "MIT"

{pysodafair-0.1.65 → pysodafair-0.1.67}/pysoda/core/dataset_generation/upload.py

@@ -3460,10 +3460,7 @@ def validate_dataset_structure(soda, resume):
             connect_pennsieve_client(accountname)
         except Exception as e:
             main_curate_status = "Done"
-            if isinstance(e, AttributeError):
-                raise Exception("The Pennsieve Agent cannot access datasets but needs to in order to work. Please try again. If the issue persists, please contact the SODA team. The SODA team will contact Pennsieve to help resolve this issue.")
-            else:
-                raise PennsieveAccountInvalid("Please select a valid Pennsieve account.")
+            raise e
 
     if uploading_to_existing_ps_dataset(soda):
         # check that the Pennsieve dataset is valid

{pysodafair-0.1.65 → pysodafair-0.1.67}/pysoda/schema/dataset_description.json

@@ -4,7 +4,8 @@
   "properties": {
     "metadata_version": {
       "type": "string",
-      "description": "The version of the metadata schema used."
+      "description": "The version of the metadata schema used.",
+      "enum": ["3.0.0", "3.0.1", "3.0.2"]
     },
     "type": {
       "type": "string",

{pysodafair-0.1.65 → pysodafair-0.1.67}/pysoda/schema/manifest.json

@@ -11,8 +11,8 @@
         },
         "timestamp": {
           "type": "string",
-          "description": "Timestamp of when the data was created or last modified. This should be in ISO 8601 format. Per the SDS guidelines, commas are to be used for separating fractional seconds.",
-          "pattern": "^[0-9]{4}-[0-1][0-9]-[0-3][0-9]T[0-2][0-9]:[0-6][0-9](:[0-6][0-9](,[0-9]{1,9})?)?(Z|[+-][0-2][0-9]:[0-6][0-9])$"
+          "description": "Timestamp of when the data was created or last modified. This should be in ISO 8601 format. Per the SDS guidelines, commas are to be used for separating fractional seconds. Empty string for when it does not apply.",
+          "pattern": "^([0-9]{4}-[0-1][0-9]-[0-3][0-9]T[0-2][0-9]:[0-6][0-9](:[0-6][0-9](,[0-9]{1,9})?)?(Z|[+-][0-2][0-9]:[0-6][0-9])?)?$"
         },
         "description": {
           "type": "string",

{pysodafair-0.1.65 → pysodafair-0.1.67}/pysoda/utils/exceptions.py

@@ -17,6 +17,14 @@ class PennsieveAgentError(Exception):
     def __str__(self):
         return self.error_message
     
+
+class PennsieveAgentRPCError(Exception):
+    def __init__(self, error_message):
+        self.error_message = error_message
+
+    def __str__(self):
+        return self.error_message
+    
 class FailedToFetchPennsieveDatasets(Exception):
     def __init__(self, error_message):
         self.error_message = error_message
@@ -120,7 +128,7 @@ class PennsieveDatasetNameInvalid(Exception):
 class PennsieveAccountInvalid(Exception):
     def __init__(self, account_name):
         self.account_name = account_name
-        self.error_message = f"The Pennsieve account name {self.account_name} is invalid."
+        self.error_message = f"The Pennsieve account name {self.account_name} is invalid. Please try again. If the issue persists, please contact the SODA team."
 
     def __str__(self):
         return self.error_message

pysodafair-0.1.67/pysoda/utils/pennsieveAgentUtils.py

@@ -0,0 +1,20 @@
+from pennsieve2.pennsieve import Pennsieve
+from .exceptions import PennsieveAgentError, PennsieveAgentRPCError, PennsieveAccountInvalid
+
+def connect_pennsieve_client(account_name):
+    """
+        Connects to Pennsieve Python client to the Agent and returns the initialized Pennsieve object.
+    """
+    try:
+        return Pennsieve(profile_name=account_name)
+    except Exception as e:
+        if "End of TCP stream" in str(e):
+            raise PennsieveAgentRPCError(f"Could not connect to the Pennsieve Agent error coming from the Agent. This can likely be resolved by retrying. If the issue persists, please contact the SODA team and they will reach out to Pennsieve to help resolve this.") from e
+        elif isinstance(e, AttributeError):
+            raise Exception("The Pennsieve Agent cannot access datasets but needs to in order to work. Please try again. If the issue persists, please contact the SODA team. The SODA team will contact Pennsieve to help resolve this issue.") from e
+        elif "Profile not found" in str(e):
+            raise PennsieveAccountInvalid(account_name) from e
+        elif "Error connecting to server" in str(e):
+            raise PennsieveAgentError(f"Could not connect to the Pennsieve agent: {e}") from e
+        else:
+            raise PennsieveAgentError("An unknown error occurred when trying to connect to the Pennsieve Agent. If this issue persists, please contact the SODA team.") from e

pysodafair-0.1.65/pysoda/utils/pennsieveAgentUtils.py

@@ -1,11 +0,0 @@
-from pennsieve2.pennsieve import Pennsieve
-from .exceptions import PennsieveAgentError
-
-def connect_pennsieve_client(account_name):
-    """
-        Connects to Pennsieve Python client to the Agent and returns the initialized Pennsieve object.
-    """
-    try:
-        return Pennsieve(profile_name=account_name)
-    except Exception as e:
-        raise PennsieveAgentError(f"Could not connect to the Pennsieve agent: {e}")