dcicutils 8.14.0.1b27__py3-none-any.whl → 8.14.0.1b29__py3-none-any.whl

dcicutils/scripts/update_portal_object.py

@@ -562,8 +562,11 @@ def _load_data(portal: Portal, load: str, ini_file: str, explicit_schema_name: O
                     else:
                         data = {schema_name: [data]}
                 if not _is_schema_name_list(portal, schema_names := list(data.keys())):
-                    _print(f"Unrecognized types in JSON data file: {inserts_file}")
-                    return False
+                    if not (schema_name := _get_schema_name_from_schema_named_json_file_name(portal, inserts_file)):
+                        _print(f"Unrecognized types in JSON data file: {inserts_file}")
+                    # Assume simple object of type from the JSON file name.
+                    schema_names = [schema_name]
+                    data = {schema_name: [data]}
                 with temporary_directory() as tmpdir:
                     nfiles = 0
                     for schema_name in schema_names:

dcicutils/scripts/view_portal_object.py

@@ -307,28 +307,76 @@ def _get_portal_object(portal: Portal, uuid: str,
             return None
         return metadata_types
 
-    response = None
-    try:
-        if not uuid.startswith("/"):
-            path = f"/{uuid}"
-        else:
-            path = uuid
-        response = portal.get(path, raw=raw or inserts, database=database)
-    except Exception as e:
-        if "404" in str(e) and "not found" in str(e).lower():
-            _print(f"Portal object not found at {portal.server}: {uuid}")
-            _exit()
-        _exit(f"Exception getting Portal object from {portal.server}: {uuid}\n{get_error_message(e)}")
-    if not response:
-        if check:
-            return None
-        _exit(f"Null response getting Portal object from {portal.server}: {uuid}")
-    if response.status_code not in [200, 307]:
-        # TODO: Understand why the /me endpoint returns HTTP status code 307, which is only why we mention it above.
-        _exit(f"Invalid status code ({response.status_code}) getting Portal object from {portal.server}: {uuid}")
-    if not response.json:
-        _exit(f"Invalid JSON getting Portal object: {uuid}")
-    response = response.json()
+    def write_insert_files(response: dict) -> None:
+        nonlocal insert_files, force
+        output_directory = insert_files if isinstance(insert_files, str) else os.getcwd()
+        for schema_name in response:
+            schema_data = response[schema_name]
+            file_name = f"{to_snake_case(schema_name)}.json"
+            file_path = os.path.join(output_directory, file_name)
+            message_verb = "Writing"
+            if os.path.exists(file_path):
+                message_verb = "Overwriting"
+                if os.path.isdir(file_path):
+                    _print(f"WARNING: Output file already exists as a directory. SKIPPING: {file_path}")
+                    continue
+                if not force:
+                    _print(f"Output file already exists: {file_path}")
+                    if not yes_or_no(f"Overwrite this file?"):
+                        continue
+            if verbose:
+                _print(f"{message_verb} {schema_name} (object{'s' if len(schema_data) != 1 else ''}:"
+                       f" {len(schema_data)}) file: {file_path}")
+            with io.open(file_path, "w") as f:
+                json.dump(schema_data, f, indent=4)
+
+    if os.path.exists(uuid) and inserts:
+        # Very special case: If given "uuid" (or other path) as actually a file then assume it
+        # contains a list of references (e.g. /Donor/3039a6ca-9849-432d-ad49-2c5630bcbee7) to fetch.
+        response = {}
+        if verbose:
+            _print(f"Reading references from file: {uuid}")
+        with io.open(uuid) as f:
+            for line in f:
+                if ((line := line.strip()) and (components := line.split("/")) and (len(components) > 1) and
+                    (schema_name := components[1]) and (schema_name := _get_schema(portal, schema_name)[1])):  # noqa
+                    try:
+                        if ((result := portal.get(line, raw=True, database=database)) and
+                            (result.status_code in [200, 307]) and (result := result.json())):  # noqa
+                            if not response.get(schema_name):
+                                response[schema_name] = []
+                            response[schema_name].append(result)
+                            continue
+                    except Exception:
+                        pass
+                    _print(f"Cannot get reference: {line}")
+            if insert_files:
+                write_insert_files(response)
+            return response
+    else:
+        response = None
+        try:
+            if not uuid.startswith("/"):
+                path = f"/{uuid}"
+            else:
+                path = uuid
+            response = portal.get(path, raw=raw or inserts, database=database)
+        except Exception as e:
+            if "404" in str(e) and "not found" in str(e).lower():
+                _print(f"Portal object not found at {portal.server}: {uuid}")
+                _exit()
+            _exit(f"Exception getting Portal object from {portal.server}: {uuid}\n{get_error_message(e)}")
+        if not response:
+            if check:
+                return None
+            _exit(f"Null response getting Portal object from {portal.server}: {uuid}")
+        if response.status_code not in [200, 307]:
+            # TODO: Understand why the /me endpoint returns HTTP status code 307, which is only why we mention it above.
+            _exit(f"Invalid status code ({response.status_code}) getting Portal object from {portal.server}: {uuid}")
+        if not response.json:
+            _exit(f"Invalid JSON getting Portal object: {uuid}")
+        response = response.json()
+
     response_types = {}
     if inserts:
         # Format results as suitable for inserts (e.g. via update-portal-object).
@@ -376,26 +424,27 @@ def _get_portal_object(portal: Portal, uuid: str,
               (isinstance(response_type := response_cooked.json().get("@type"), list) and response_type)):
             response = {f"{response_type[0]}": [prune_data(response)]}
         if insert_files:
-            output_directory = insert_files if isinstance(insert_files, str) else os.getcwd()
-            for schema_name in response:
-                schema_data = response[schema_name]
-                file_name = f"{to_snake_case(schema_name)}.json"
-                file_path = os.path.join(output_directory, file_name)
-                message_verb = "Writing"
-                if os.path.exists(file_path):
-                    message_verb = "Overwriting"
-                    if os.path.isdir(file_path):
-                        _print(f"WARNING: Output file already exists as a directory. SKIPPING: {file_path}")
-                        continue
-                    if not force:
-                        _print(f"Output file already exists: {file_path}")
-                        if not yes_or_no(f"Overwrite this file?"):
-                            continue
-                if verbose:
-                    _print(f"{message_verb} {schema_name} (object{'s' if len(schema_data) != 1 else ''}:"
-                           f" {len(schema_data)}) file: {file_path}")
-                with io.open(file_path, "w") as f:
-                    json.dump(schema_data, f, indent=4)
+            write_insert_files(response)
+#           output_directory = insert_files if isinstance(insert_files, str) else os.getcwd()
+#           for schema_name in response:
+#               schema_data = response[schema_name]
+#               file_name = f"{to_snake_case(schema_name)}.json"
+#               file_path = os.path.join(output_directory, file_name)
+#               message_verb = "Writing"
+#               if os.path.exists(file_path):
+#                   message_verb = "Overwriting"
+#                   if os.path.isdir(file_path):
+#                       _print(f"WARNING: Output file already exists as a directory. SKIPPING: {file_path}")
+#                       continue
+#                   if not force:
+#                       _print(f"Output file already exists: {file_path}")
+#                       if not yes_or_no(f"Overwrite this file?"):
+#                           continue
+#               if verbose:
+#                   _print(f"{message_verb} {schema_name} (object{'s' if len(schema_data) != 1 else ''}:"
+#                          f" {len(schema_data)}) file: {file_path}")
+#               with io.open(file_path, "w") as f:
+#                   json.dump(schema_data, f, indent=4)
     elif raw:
         response.pop("schema_version", None)
     return response

{dcicutils-8.14.0.1b27.dist-info → dcicutils-8.14.0.1b29.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dcicutils
-Version: 8.14.0.1b27
+Version: 8.14.0.1b29
 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.14.0.1b27.dist-info → dcicutils-8.14.0.1b29.dist-info}/RECORD

@@ -60,8 +60,8 @@ dcicutils/s3_utils.py,sha256=h2B9ftOo-kxqfiKth5ZDC_cAUFy1Pbu7BrVanFnE5Iw,28839
 dcicutils/schema_utils.py,sha256=GmRm-XqZKJ6qine16SQF1txcby9WougDav_sYmKNs9E,12400
 dcicutils/scripts/publish_to_pypi.py,sha256=sMd4WASQGlxlh7uLrt2eGkFRXYgONVmvIg8mClMS5RQ,13903
 dcicutils/scripts/run_license_checker.py,sha256=z2keYnRDZsHQbTeo1XORAXSXNJK5axVzL5LjiNqZ7jE,4184
-dcicutils/scripts/update_portal_object.py,sha256=c4-nQ_QkmVA6pnAM-08TjhdISseLPh0rg_OX3_V2ugU,41613
-dcicutils/scripts/view_portal_object.py,sha256=vsJzS985JFEW6-xOe_ExkuE4Dk21G6d8xfC9RBUNwUg,38655
+dcicutils/scripts/update_portal_object.py,sha256=BwZw1cZx2zhzp1ivn_DXUxfnmUyC5A9fAotjHV0fXf4,41875
+dcicutils/scripts/view_portal_object.py,sha256=mfaWIjVD_dtLNl8Gfue-9Xo1zBrfChe2Tr9J6aoA7sA,41274
 dcicutils/secrets_utils.py,sha256=8dppXAsiHhJzI6NmOcvJV5ldvKkQZzh3Fl-cb8Wm7MI,19745
 dcicutils/sheet_utils.py,sha256=VlmzteONW5VF_Q4vo0yA5vesz1ViUah1MZ_yA1rwZ0M,33629
 dcicutils/snapshot_utils.py,sha256=YDeI3vD-MhAtHwKDzfEm2q-n3l-da2yRpRR3xp0Ah1M,23021
@@ -75,8 +75,8 @@ dcicutils/trace_utils.py,sha256=g8kwV4ebEy5kXW6oOrEAUsurBcCROvwtZqz9fczsGRE,1769
 dcicutils/validation_utils.py,sha256=cMZIU2cY98FYtzK52z5WUYck7urH6JcqOuz9jkXpqzg,14797
 dcicutils/variant_utils.py,sha256=2H9azNx3xAj-MySg-uZ2SFqbWs4kZvf61JnK6b-h4Qw,4343
 dcicutils/zip_utils.py,sha256=_Y9EmL3D2dUZhxucxHvrtmmlbZmK4FpSsHEb7rGSJLU,3265
-dcicutils-8.14.0.1b27.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
-dcicutils-8.14.0.1b27.dist-info/METADATA,sha256=eTXjvupOrwP4AJOFmh9XvYc91x12alWq6dGPFKakDq8,3440
-dcicutils-8.14.0.1b27.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
-dcicutils-8.14.0.1b27.dist-info/entry_points.txt,sha256=W6kEWdUJk9tQ4myAgpehPdebcwvCAZ7UgB-wyPgDUMg,335
-dcicutils-8.14.0.1b27.dist-info/RECORD,,
+dcicutils-8.14.0.1b29.dist-info/LICENSE.txt,sha256=qnwSmfnEWMl5l78VPDEzAmEbLVrRqQvfUQiHT0ehrOo,1102
+dcicutils-8.14.0.1b29.dist-info/METADATA,sha256=ht8DVYhzxCHVincEsvta3kwooBimQ6Iei03TjAYL24k,3440
+dcicutils-8.14.0.1b29.dist-info/WHEEL,sha256=7Z8_27uaHI_UZAc4Uox4PpBhQ9Y5_modZXWMxtUi4NU,88
+dcicutils-8.14.0.1b29.dist-info/entry_points.txt,sha256=W6kEWdUJk9tQ4myAgpehPdebcwvCAZ7UgB-wyPgDUMg,335
+dcicutils-8.14.0.1b29.dist-info/RECORD,,