dcicutils 8.4.0.1b7__tar.gz → 8.4.0.1b9__tar.gz

{dcicutils-8.4.0.1b7 → dcicutils-8.4.0.1b9}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.4.0.1b7
+Version: 8.4.0.1b9
 Summary: Utility package for interacting with the 4DN Data Portal and other 4DN resources
 Home-page: https://github.com/4dn-dcic/utils
 License: MIT

{dcicutils-8.4.0.1b7 → dcicutils-8.4.0.1b9}/dcicutils/structured_data.py

@@ -37,7 +37,6 @@ ARRAY_NAME_SUFFIX_CHAR = "#"
 ARRAY_NAME_SUFFIX_REGEX = re.compile(rf"{ARRAY_NAME_SUFFIX_CHAR}\d+")
 DOTTED_NAME_DELIMITER_CHAR = "."
 FILE_SCHEMA_NAME = "File"
-FILE_SCHEMA_NAME_PROPERTY = "filename"
 
 # Forward type references for type hints.
 Portal = Type["Portal"]
@@ -105,48 +104,6 @@ class StructuredDataSet:
     def resolved_refs(self) -> List[str]:
         return self._resolved_refs
 
-    @staticmethod
-    def format_issue(issue: dict, original_file: Optional[str] = None) -> str:
-        def src_string(issue: dict) -> str:
-            if not isinstance(issue, dict) or not isinstance(issue_src := issue.get("src"), dict):
-                return ""
-            show_file = original_file and (original_file.endswith(".zip") or
-                                           original_file.endswith(".tgz") or original_file.endswith(".gz"))
-            src_file = issue_src.get("file") if show_file else ""
-            src_type = issue_src.get("type")
-            src_column = issue_src.get("column")
-            src_row = issue_src.get("row", 0)
-            if src_file:
-                src = f"{os.path.basename(src_file)}"
-                sep = ":"
-            else:
-                src = ""
-                sep = "."
-            if src_type:
-                src += (sep if src else "") + src_type
-                sep = "."
-            if src_column:
-                src += (sep if src else "") + src_column
-            if src_row > 0:
-                src += (" " if src else "") + f"[{src_row}]"
-            if not src:
-                if issue.get("warning"):
-                    src = "Warning"
-                elif issue.get("error"):
-                    src = "Error"
-                else:
-                    src = "Issue"
-            return src
-        issue_message = None
-        if issue:
-            if error := issue.get("error"):
-                issue_message = error
-            elif warning := issue.get("warning"):
-                issue_message = warning
-            elif issue.get("truncated"):
-                return f"Truncated result set | More: {issue.get('more')} | See: {issue.get('details')}"
-        return f"{src_string(issue)}: {issue_message}" if issue_message else ""
-
     def _load_file(self, file: str) -> None:
         # Returns a dictionary where each property is the name (i.e. the type) of the data,
         # and the value is array of dictionaries for the data itself. Handle these kinds of files:
@@ -369,9 +326,6 @@ class Schema:
     def resolved_refs(self) -> List[str]:
         return list(self._resolved_refs)
 
-    def is_file_type(self) -> bool:
-        return (self.name == FILE_SCHEMA_NAME) or (self._portal and self._portal.is_file_schema(self.name))
-
     def get_map_value_function(self, column_name: str) -> Optional[Any]:
         return (self._get_typeinfo(column_name) or {}).get("map")
 
@@ -604,6 +558,7 @@ class PortalBase:
         elif isinstance(key, dict):
             self._key = key
             self._key_pair = (key.get("key"), key.get("secret")) if key else None
+            self._server = key.get("server")
         elif isinstance(key, tuple) and len(key) >= 2:
             self._key = {"key": key[0], "secret": key[1]}
             self._key_pair = key

{dcicutils-8.4.0.1b7 → dcicutils-8.4.0.1b9}/pyproject.toml

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "dcicutils"
-version = "8.4.0.1b7"  # TODO: To become 8.4.1
+version = "8.4.0.1b9"  # TODO: To become 8.4.1
 description = "Utility package for interacting with the 4DN Data Portal and other 4DN resources"
 authors = ["4DN-DCIC Team <support@4dnucleome.org>"]
 license = "MIT"