deriva 1.7.1__py3-none-any.whl → 1.7.4__py3-none-any.whl

deriva/core/hatrac_store.py

@@ -448,14 +448,8 @@ class HatracStore(DerivaBinding):
         """Retrieve a namespace.
         """
         headers = {'Content-Type': 'application/json', 'Accept': 'application/json'}
-        try:
-            resp = self.get(namespace_path, headers)
-            namespaces = resp.json()
-            return namespaces
-        except requests.HTTPError as e:
-            if e.response.status_code == requests.codes.not_found:
-                return None
-            raise
+        resp = self.get(namespace_path, headers)
+        return resp.json()
 
     def create_namespace(self, namespace_path, parents=True):
         """Create a namespace.
@@ -485,18 +479,13 @@ class HatracStore(DerivaBinding):
                 url += '/' + urlquote(role)
         elif role:
             raise ValueError('Do not specify "role" if "access" mode is not specified.')
-        try:
-            resp = self.get(url, headers)
-            if role:
-                return {access: [role]}
-            elif access:
-                return {access: resp.json()}
-            else:
-                return resp.json()
-        except requests.HTTPError as e:
-            if e.response.status_code == requests.codes.not_found:
-                return None
-            raise
+        resp = self.get(url, headers)
+        if role:
+            return {access: [role]}
+        elif access:
+            return {access: resp.json()}
+        else:
+            return resp.json()
 
     def set_acl(self, resource_name, access, roles, add_role=False):
         """Set the object or namespace ACL resource.

deriva/core/mmo.py

@@ -0,0 +1,379 @@
+"""Model management operations.
+"""
+import logging
+from collections import namedtuple
+
+from deriva.core import tag as tags
+
+logger = logging.getLogger(__name__)
+
+Match = namedtuple('Match', 'anchor tag context container mapping')
+
+__search_box__ = 'search-box'
+
+
+def replace(model, symbol, replacement):
+    """Replaces `symbol` with `replacement` where symbol is found in mappings.
+
+    See the 'find' function for notes on what are 'symbols' and how symbols are found in the model.
+
+    The `symbol` and its `replacement` must be of the same type (i.e., columns or constraints). For columns, only the
+    column name may differ. For constraints, the whole name or just the schema part may be replaced.
+    """
+    logger.debug(f'Replacing symbol "{symbol}" with "{replacement}".')
+    assert len(symbol) == len(replacement), "symbol and replacement must have same length"
+    assert len(symbol) != 3 or symbol[0:2] == replacement[0:2], "column symbols may only differ in the column name"
+
+    # step 1: find all matches
+    for anchor, tag, context, container, mapping in find(model, symbol):
+        # step 2: replace symbol in each matching mapping found in model
+
+        # case: mapping is a `str` column name in a vizcol context _or_ a source-defs columns `list`
+        if isinstance(mapping, str) and isinstance(container, list):
+            assert mapping == symbol[-1], "expected mapping to match the column name"
+            for idx, val in enumerate(container):
+                if val == mapping:
+                    container[idx] = replacement[-1]
+
+        # case: mapping is a `dict` pseudo-column and `source` is a `str` column name
+        elif isinstance(mapping, dict) and isinstance(mapping.get('source'), str):
+            assert mapping['source'] == symbol[-1], "expected pseudo-column `source` to match the column name"
+            mapping['source'] = replacement[-1]
+
+        # case: mapping is a `dict` pseudo-column and `source` is a source path `list`
+        elif isinstance(mapping, dict) and isinstance(mapping.get('source'), list):
+            _replace_symbol_in_source_path(anchor, mapping['source'], symbol, replacement)
+
+        # case: mapping is a `str` sourcekey in a source-defs source `dict`
+        elif isinstance(mapping, str) and isinstance(container, dict):
+            assert mapping in container, "expected to find sourcekey `mapping` in sources `container`"
+            assert isinstance(container[mapping], dict), "expected `container[mapping]` to be a source definition dict"
+            _replace_symbol_in_source_path(anchor, container[mapping]['source'], symbol, replacement)
+
+        # case: mapping is a `list` constraint name in a vizcol or vizfkey context _or_ a source-defs fkeys `list`
+        elif isinstance(mapping, list) and isinstance(container, list):
+            assert _is_constraint_match(mapping, symbol), "expected mapping to match the constraint name"
+            for idx, val in enumerate(container):
+                if val == mapping:
+                    container[idx] = _rewrite_constraint_name(val, replacement)
+        else:
+            logger.warning(f'Unhandled case for replace operation')
+
+
+def prune(model, symbol):
+    """Prunes mappings from a model where symbol found in mapping.
+
+    See the 'find' function for notes on what are 'symbols' and how symbols are found in the model.
+
+    **Note on pruning source definitions**
+    When this methods prunes a `source-definitions` entry from the model, it will also prune
+    `visible-{columns|foreign-keys}` that reference its `sourcekey` directly or as a "path prefix" in a pseudo-column
+    definition. It will prune any references found in `wait_for` display attributes. Also, it will recurse over the
+    source definitions repeating the above pruning for each sourcekey dependent on the originally affected sourcekey.
+    """
+    logger.debug(f'Pruning symbol "{symbol}".')
+    # step 1: find all matches
+    for anchor, tag, context, container, mapping in find(model, symbol):
+        # step 2: remove mapping from model, for each mapping found
+        if tag in [tags.visible_columns, tags.visible_foreign_keys]:
+            container.remove(mapping)
+        elif tag == tags.source_definitions:
+            logger.debug(f'Removing "{tag}" mapping "{mapping}" from container "{container}".')
+            if isinstance(container, list):
+                # step 2.a. match found in 'columns' or 'fkeys' lists, remove item and continue
+                container.remove(mapping)
+            else:
+                # step 2.b. match found in 'sources' dictionary, remove then search for dependencies
+                assert isinstance(container, dict), "Expected dictionary typed container"
+                del container[mapping]
+
+                # step 2.c. find all dependencies on sourcekey in anchor's annotations and remove them
+                for match in _find_sourcekey(anchor, mapping):
+                    logger.debug(f'Removing "{mapping}" sourcekey dependency; mapping "{match.mapping}" from "{match.tag}".')
+                    if match.tag in [tags.visible_columns, tags.visible_foreign_keys]:
+                        match.container.remove(match.mapping)
+                    elif match.tag == tags.citation:
+                        del match.anchor.annotations[match.tag]
+                    elif match.tag == tags.source_definitions:
+                        del match.container[match.mapping]
+                    else:
+                        logger.warning(f'Unexpected tag "{match.tag}".')
+        else:
+            logger.warning(f'Unhandled tag "{tag}".')
+
+
+def find(model, symbol):
+    """Finds mappings within a model where the mapping contains a given symbol.
+
+    Searches the following annotation tags:
+    - source-definitions
+    - visible-columns
+    - visible-foreign-keys
+
+    Presently, there are two forms of symbols:
+    - constraint: `[schema_name, constraint_name]` may refer to a key or fkey. If `constraint_name` is None then the
+                  match is based only on `schema_name`
+    - column: `[schema_name, table_name, column_name]`
+
+    returns: list containing Match(anchor, tag, context, container, mapping) tuples
+    - anchor: the model object that anchors the mapping
+    - tag: the annotation tag where the mapping was found
+    - context: the annotation context where the mapping was found
+    - container: the parent container of the mapping
+    - mapping: the mapping in which the symbol was found
+    """
+    # [NOTE] If/when table must be supported, the ambiguity could be addressed as:
+    # - table [schema_name, table_name, None] where the final None in the column category implies that we are removing
+    #   not a single column but the whole table (and hence all of its columns)
+    matches = []
+
+    # At present, mappings only reside in model elements: table and column.
+    for schema in model.schemas.values():
+        for table in schema.tables.values():
+            for tag in table.annotations:
+
+                # case: visible-columns or visible-foreign-keys
+                if tag == tags.visible_columns or tag == tags.visible_foreign_keys:
+                    for context in table.annotations[tag]:
+                        if context == 'filter':
+                            vizsrcs = table.annotations[tag][context].get('and', [])
+                        else:
+                            vizsrcs = table.annotations[tag][context]
+
+                        for vizsrc in vizsrcs:  # vizsrc is a vizcol or vizfkey entry
+                            # case: constraint form of vizsrc
+                            if isinstance(vizsrc, list) \
+                                    and _is_constraint_match(vizsrc, symbol):
+                                matches.append(Match(table, tag, context, vizsrcs, vizsrc))
+                            # case: pseudo-column form of vizsrc
+                            elif isinstance(vizsrc, dict) and 'source' in vizsrc \
+                                    and _is_symbol_in_source(table, vizsrc['source'], symbol):
+                                matches.append(Match(table, tag, context, vizsrcs, vizsrc))
+                            # case: column form of vizsrc
+                            elif isinstance(vizsrc, str) \
+                                    and [table.schema.name, table.name, vizsrc] == symbol:
+                                matches.append(Match(table, tag, context, vizsrcs, vizsrc))
+
+                # case: source-definitions
+                elif tag == tags.source_definitions:
+                    # search 'columns'
+                    cols = table.annotations[tag].get('columns')
+                    if isinstance(cols, list) \
+                            and len(symbol) == 3 \
+                            and [table.schema.name, table.name] == symbol[0:2] \
+                            and symbol[-1] in cols:
+                        matches.append(Match(table, tag, 'columns', cols, symbol[-1]))
+
+                    # search 'fkeys'
+                    fkeys = table.annotations[tag].get('fkeys')
+                    if isinstance(fkeys, list):
+                        for fkey in fkeys:
+                            if _is_constraint_match(fkey, symbol):
+                                matches.append(Match(table, tag, 'fkeys', fkeys, fkey))
+
+                    # search 'sources'
+                    sources = table.annotations[tag].get('sources')
+                    for sourcekey in sources:
+                        if _is_symbol_in_source(table, sources[sourcekey].get('source', []), symbol):
+                            matches.append(Match(table, tag, 'sources', sources, sourcekey))
+
+                    # search 'search-box'
+                    search_box = table.annotations[tag].get(__search_box__)
+                    if isinstance(search_box, dict) and isinstance(search_box.get('or'), list):
+                        for search_col in search_box['or']:
+                            if _is_symbol_in_source(table, search_col.get('source'), symbol):
+                                matches.append(Match(table, tag, __search_box__, search_box['or'], search_col))
+
+    return matches
+
+
+def _is_constraint_match(constraint_name, symbol):
+    """Tests if the constraint name matches the given symbol.
+
+    :param constraint_name: a constraint name pair
+    :param symbol: either a constraint name part or a schema name
+    """
+    if not (isinstance(constraint_name, list) and len(constraint_name) == 2):
+        # case: malformed constraint name
+        return False
+    if not isinstance(symbol, list) or len(symbol) != 2:
+        # case: symbol not a constraint name
+        return False
+    elif symbol[1]:
+        # case: symbol is a complete constraint name
+        return constraint_name == symbol
+    else:
+        # case: symbol is a schema name only
+        return constraint_name[0] == symbol[0]
+
+
+def _is_symbol_in_source(table, source, symbol):
+    """Finds symbol in a source mapping.
+    """
+
+    # case: source is a column name
+    if isinstance(source, str):
+        return [table.schema.name, table.name, source] == symbol
+
+    # case: source is a path, symbol is a constraint
+    if isinstance(source, list) and isinstance(symbol, list):
+
+        # case: symbol is a constraint
+        if len(symbol) == 2:
+            for pathelem in source:
+                if isinstance(pathelem, dict):
+                    constraint_name = pathelem.get('inbound') or pathelem.get('outbound')
+                    if _is_constraint_match(constraint_name, symbol):
+                        return True
+
+        # case: symbol is a column name
+        #  -- start with column in path and test if matches last value of source path
+        #  -- then determine if the table reference matches (last fkey in/out points to correct table)
+        #  -- isinstance(source[-1], str) and source[-1] == symbol[-1]
+        #  -- isinstance(source[-2], dict) -- ie, a constraint
+        #  -- lookup fkey = model.fkeys(*source[-2].get('inbound' or 'outbound')
+        #  -- if 'inbound' and fkey.table == symbol's table
+        #  -- if 'outbound' and fkey.pk_table == symbol's table
+        if len(symbol) == 3 \
+            and len(source) >= 2 \
+            and source[-1] == symbol[-1] \
+            and isinstance(source[-2], dict):
+
+            # case: inbound fkey
+            if 'inbound' in source[-2]:
+                fkey = table.schema.model.fkey(source[-2]['inbound'])
+                return [fkey.table.schema.name, fkey.table.name] == symbol[0:2]
+
+            # case: outbound fkey
+            elif 'outbound' in source[-2]:
+                fkey = table.schema.model.fkey(source[-2]['outbound'])
+                return [fkey.pk_table.schema.name, fkey.pk_table.name] == symbol[0:2]
+
+    return False
+
+
+def _find_sourcekey(table, sourcekey):
+    """Find usages of `sourcekey` in `table`'s annotations.
+    """
+    matches = []
+
+    # case: source-definitions
+    #                           sources, <sourcekey>, display, wait_for (markdown_pattern)
+    #                                                 source, [0], sourcekey
+    #
+    # case: citation
+    #                 wait_for (*_pattern)
+    #
+    # case: visible-columns or visible-foreign-keys
+    #                        <context>, <pseudocolumn>, sourcekey
+    #                                                   source, [0], sourcekey
+    #                                                   display, wait_for (markdown_pattern)
+
+    # step 1: find all references to sourcekey in source-definitions (recursively)
+    sources = table.annotations[tags.source_definitions].get('sources', {})
+    sourcekeys = _find_dependent_sourcekeys(sourcekey, sources)
+    matches.extend([
+        Match(table, tags.source_definitions, None, sources, sourcekey)
+        for sourcekey in sourcekeys
+    ])
+
+    # step 2: find all other references to the set of {sourcekeys} | {sourcekey} found in first step
+    sourcekeys.add(sourcekey)
+
+    #      2.a.: find sourcekey in citations
+    citation = table.annotations.get(tags.citation)
+    if citation:
+        for sourcekey in sourcekeys:
+            if sourcekey in citation.get('wait_for', []):
+                matches.append(Match(table, tags.citation, None, None, None))
+                break
+
+    #      2.b.: find sourcekey in visible-columns or visible-foreign-keys
+    for tag in (tags.visible_columns, tags.visible_foreign_keys):
+        for context in table.annotations.get(tag, {}):
+            vizcols = table.annotations[tag][context]
+            for vizcol in vizcols:
+                for sourcekey in sourcekeys:
+                    if _is_dependent_on_sourcekey(sourcekey, vizcol):
+                        matches.append(Match(table, tag, context, vizcols, vizcol))
+
+    return matches
+
+
+def _find_dependent_sourcekeys(sourcekey, sources, deps=None):
+    """Find 'sourcekey' dependencies in 'sources' source definitions.
+    """
+    # initialize deps to empty set
+    deps = deps or set()
+
+    # remove self from sources
+    if sourcekey in sources:
+        sources = sources.copy()
+        sources.pop(sourcekey)
+
+    # test if each 'candidate' source is dependent on this 'sourcekey'
+    for candidate in sources:
+        # case: source 'search-box', need to check sources in its `or` block, but do not recurse
+        if candidate == __search_box__:
+            for source_def in sources[__search_box__].get('or', []):
+                if _is_dependent_on_sourcekey(sourcekey, source_def):
+                    # add 'search-box' to deps, continue
+                    deps.add(__search_box__)
+                    break
+        # case: all other sources
+        if _is_dependent_on_sourcekey(sourcekey, sources[candidate]):
+            # add to deps
+            deps.add(candidate)
+            # union with deps of the candidate
+            deps.union(_find_dependent_sourcekeys(candidate, sources, deps=deps))
+
+    return deps
+
+
+def _is_dependent_on_sourcekey(sourcekey, source_def):
+    """Tests if 'source_def' is dependent on 'sourcekey'.
+    """
+    # case: source_def is not a pseudo-column
+    if not isinstance(source_def, dict):
+        return False
+    # case: sourcekey referenced directly
+    if sourcekey == source_def.get('sourcekey'):
+        return True
+    # case: sourcekey in path prefix
+    if not isinstance(source_def.get('source'), str) and sourcekey == source_def.get('source', [{}])[0].get('sourcekey'):
+        return True
+    # case: sourcekey in wait_for
+    if sourcekey in source_def.get('display', {}).get('wait_for', []):
+        return True
+    # not dependent
+    return False
+
+
+def _rewrite_constraint_name(constraint_name, replacement):
+    """Rewrites constraint name according to replacement symbol.
+    """
+    return [
+        replacement[0],
+        replacement[1] if replacement[1] else constraint_name[1]
+    ]
+
+
+def _replace_symbol_in_source_path(anchor, source, symbol, replacement):
+    """Replaces `symbol` with `replacement` in `source`.
+    """
+    assert isinstance(source, list), 'expected source to be a list'
+    assert source, 'expected source to be non-empty'
+
+    if len(symbol) == 3:  # case: column symbol replacement
+        assert source[-1] == symbol[-1], "expected source path to terminate in symbol column name"
+        source[-1] = replacement[-1]
+
+    if len(symbol) == 2:  # case: constraint name replacement
+        assert _is_symbol_in_source(anchor, source, symbol), "expected to find symbol in mapping source"
+        for i, pathelem in enumerate(source):
+            if not isinstance(pathelem, dict):
+                continue
+            for direction in ('inbound', 'outbound'):
+                if _is_constraint_match(pathelem.get(direction), symbol):
+                    pathelem[direction] = _rewrite_constraint_name(pathelem[direction], replacement)
+                    break

deriva/core/utils/globus_auth_utils.py

@@ -52,7 +52,7 @@ class GlobusAuthUtil:
         client_id = kwargs.get("client_id")
         client_secret = kwargs.get("client_secret")
         if not (client_id and client_secret):
-            cred_file = kwargs.get("credential_file", CLIENT_CRED_FILE)
+            cred_file = kwargs.get("credential_file", CLIENT_CRED_FILE) or CLIENT_CRED_FILE
             if os.path.isfile(cred_file):
                 creds = read_config(cred_file)
                 if creds:
@@ -60,6 +60,8 @@ class GlobusAuthUtil:
                     if client:
                         client_id = client.get('client_id')
                         client_secret = client.get('client_secret')
+            else:
+                logging.warning("No Globus client credential file found at: %s" % cred_file)
 
         if not (client_id and client_secret):
             logging.warning("Client ID and secret not specified and/or could not be determined.")

deriva/transfer/download/processors/postprocess/transfer_post_processor.py

@@ -128,12 +128,12 @@ class Boto3UploadPostProcessor(UploadPostProcessor):
         object_qualifier = compute_hashes(
             identity.encode() if identity else
             "anon-" + self.envars.get("request_ip", "unknown").encode(), hashes=['md5'])['md5'][0]
-        if not stob(self.parameters.get("overwrite", "False")):
+        if not stob(self.parameters.get("overwrite", False)):
             now = datetime.datetime.now()
             object_qualifier = "/".join([object_qualifier, now.strftime("%Y-%m-%d_%H.%M.%S")])
 
         for k, v in self.outputs.items():
-            object_name = "/".join([self.path, object_qualifier, k])
+            object_name = "/".join([self.path, object_qualifier, k]).lstrip("/")
             file_path = v[LOCAL_PATH_KEY]
             acl = self.parameters.get("acl", "private")
             signed_url = stob(self.parameters.get("signed_url", acl == "public-read"))

deriva/transfer/download/processors/query/base_query_processor.py

@@ -138,7 +138,8 @@ class BaseQueryProcessor(BaseProcessor):
             if not (urlparts.scheme and urlparts.netloc):
                 urlparts = urlsplit(self.catalog.get_server_uri())
                 server_uri = urlparts.scheme + "://" + urlparts.netloc
-                url = ''.join([server_uri, url])
+                sep = "/" if not url.startswith("/") else ""
+                url = ''.join([server_uri, sep, url])
 
         return url
 

deriva/transfer/upload/deriva_upload.py

@@ -233,8 +233,11 @@ class DerivaUpload(object):
         self.credentials = credentials
         self.catalog.set_credentials(self.credentials, host)
         self.store.set_credentials(self.credentials, host)
-        attributes = self.catalog.get_authn_session().json()
-        self.identity = attributes.get("client", self.identity)
+        try:
+            attributes = self.catalog.get_authn_session().json()
+            self.identity = attributes.get("client", self.identity)
+        except Exception as e:
+            logger.warning("Unable to determine user identity: %s" % e)
 
     def setConfig(self, config_file):
         if not config_file:

{deriva-1.7.1.dist-info → deriva-1.7.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: deriva
-Version: 1.7.1
+Version: 1.7.4
 Summary: Python APIs and CLIs (Command-Line Interfaces) for the DERIVA platform.
 Home-page: https://github.com/informatics-isi-edu/deriva-py
 Author: USC Information Sciences Institute, Informatics Systems Research Division

{deriva-1.7.1.dist-info → deriva-1.7.4.dist-info}/RECORD

@@ -1,24 +1,25 @@
 deriva/__init__.py,sha256=h-QyvMVzDNpT3jyVskcSbUVFXxGCRxieFPrvTveZG9k,64
 deriva/config/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 deriva/config/acl_config.py,sha256=yZ0g_Cwv1MZXajUP2sVbc928XakUDu5Q97w9aK3VCCE,23946
-deriva/config/annotation_config.py,sha256=DQHPn4bKVYUxWPKyHkPfwLbdtOuBWpIyW_Uln-p10K0,11732
+deriva/config/annotation_config.py,sha256=sWcJnRfS5vcb85IdUOd420cmFHRyb4br5OxLCOssbec,11714
 deriva/config/annotation_validate.py,sha256=ZN0jq6As49hfsAmWONUxAStqFG9TeYzvCmRU9TQ-zD8,5228
 deriva/config/base_config.py,sha256=Y5sFotuAWWyo-LZvzbzVY2ZDaC-zhwbMXusgBF1OJYM,20724
 deriva/config/dump_catalog_annotations.py,sha256=QzaWDLfWIAQ0eWVV11zeceWgwDBOYIePJnDQgRydwTE,9362
-deriva/config/rollback_annotation.py,sha256=EMVpuaMh2VaXXoHhsr3ldc7g7e92ngszEswdGNEmGFQ,3020
+deriva/config/rollback_annotation.py,sha256=vqrIcen-KZX8LDpu2OVNivzIHpQoQgWkZAChZJctvtk,3015
 deriva/config/examples/group_owner_policy.json,sha256=8v3GWM1F_BWnYD9x_f6Eo4kBDvyy8g7mRqujfoEKLNc,2408
 deriva/config/examples/self_serve_policy.json,sha256=pW-cqWz4rJNNXwY4eVZFkQ8gKCHclC9yDa22ylfcDqY,1676
-deriva/core/__init__.py,sha256=e2yjmArOhvRrFnmJxgjd_BPYIhiYsTVeYXe3iVQIKaU,4945
+deriva/core/__init__.py,sha256=KyMruBM9qoCK0JQQvwsIDhC6leQqFueAwqGlA7oYsZA,4945
 deriva/core/annotation.py,sha256=PkAkPkxX1brQsb8_drR1Qj5QjQA5mjkpXhkq9NuZ1g8,13432
 deriva/core/base_cli.py,sha256=EkLXOTeaFWUbPaYV-eLuLGga1PbkFVWi3Jjo-e_Vb-U,2681
 deriva/core/catalog_cli.py,sha256=-6Bo6GLWFWap7y3VxkzPs73HAe_XzRXIJMW-Ri84m3M,23273
-deriva/core/datapath.py,sha256=4Q3snZ-rBqQV5x7ZAfU7fWdVcmQYu-8Ma6a7DcOL6zQ,81306
+deriva/core/datapath.py,sha256=w8LvPAd_DuknKxHc_YS6NUHhTY6XpCSkfa0m_xQUdZE,89068
 deriva/core/deriva_binding.py,sha256=_sA9HGrcVRqT-OhrneMDMOquyVOFOxLq3WzBQhasLIM,12970
 deriva/core/deriva_server.py,sha256=nsW3gwg1sIaHl3BTf-nL41AkSj3dEpcEBlatvjvN8CQ,200
-deriva/core/ermrest_catalog.py,sha256=B8XdzDScxad4PVUxRxT3GLUkV5vSsNnvMA5a76cUdsc,50817
-deriva/core/ermrest_model.py,sha256=opQunJOl4Vm62U5LBbO8w77dz9l11B0DvGDU6Sfe2FQ,85916
+deriva/core/ermrest_catalog.py,sha256=_eqQg16i1aA95R99B7tLZxHWQlYk-rLpN_0zghfNWRc,54991
+deriva/core/ermrest_model.py,sha256=OlG-TQ6VOwFKFwXzn-aVTErcd50-ZsqxVa4TyXQHoys,124919
 deriva/core/hatrac_cli.py,sha256=l9QmneLRHSMiG_z9S83ea0QGVhTS3Wq1KGPEKEDpecM,14522
-deriva/core/hatrac_store.py,sha256=t7gEsZ3SJqt1RefSGc3728PQoVs9E5UWEBNGGbbG6Bw,22582
+deriva/core/hatrac_store.py,sha256=pRupabYZzXvf1iQTYmv0AME8n7KCkTCMfrojhl_JOTs,22178
+deriva/core/mmo.py,sha256=dcB8akgsqbYMi22ClbVpOKVL6so8FjSDjSb6gP4_jFo,17852
 deriva/core/polling_ermrest_catalog.py,sha256=KsjiFqPQaHWnJZCVF5i77sdzfubqZHgMBbQ1p8V8D3s,10351
 deriva/core/schemas/app_links.schema.json,sha256=AxrkC2scxomM6N7jyjtdYA73BbZzPrmuqU8PYWe7okI,954
 deriva/core/schemas/asset.schema.json,sha256=rVQobTnTxPtC-HOQhzSjc9CHo43cK97rImYqnxSp5ZA,1287
@@ -44,7 +45,7 @@ deriva/core/schemas/visible_foreign_keys.schema.json,sha256=K-oa2qzj5EbmJCEyN6mN
 deriva/core/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 deriva/core/utils/__init__.py,sha256=XSbGaWe44hebxYvoh5huFzZkMY6TSKPOCRSjUOvaY70,124
 deriva/core/utils/core_utils.py,sha256=5xUjJ-1QrPFKOiwfSWFDdH8Hm5a-AEhzCvy2GJPjx4A,19500
-deriva/core/utils/globus_auth_utils.py,sha256=M7u6rN1IeQDb3RRN6bM3YIJMitPEP3Usugp-cLgsAr8,55601
+deriva/core/utils/globus_auth_utils.py,sha256=huPzKSr0d2NirpLzyp6CSyR1gIAdlRuP-X0jRo5W_p8,55732
 deriva/core/utils/hash_utils.py,sha256=JqUYVB3jXusCQYX9fkKmweUKBC0WQi8ZI2N8m-uKygQ,2299
 deriva/core/utils/mime_utils.py,sha256=ZT7pMjY2kQWBsgsGC3jY6kjfygdsIyiYW3BKNw_pPyg,1128
 deriva/core/utils/version_utils.py,sha256=HWNUQAZrPXu0oGjhG6gMNm3kWtfa3nR50vfH2uQxBA0,2954
@@ -65,11 +66,11 @@ deriva/transfer/download/processors/__init__.py,sha256=evLp36tZn-Z_AMshdfV3JJO8w
 deriva/transfer/download/processors/base_processor.py,sha256=R6IIHSa_euv4X2Dyhd8fvQAiVYDGJTWMQtPoukHQn-Q,3837
 deriva/transfer/download/processors/postprocess/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 deriva/transfer/download/processors/postprocess/identifier_post_processor.py,sha256=rQVnh7A9n9l5zE0MqDMYTOdpA6Ku9enFLbzWwT6hKTg,5370
-deriva/transfer/download/processors/postprocess/transfer_post_processor.py,sha256=JYEXRiGdgbGEtJKt5BvjPMZb68tU0hzqtUGeQCuWeTc,7828
+deriva/transfer/download/processors/postprocess/transfer_post_processor.py,sha256=8pSYicB-Yn_fONJcfZNGdaV8w6Zb7CiqnUMKZ9PAj94,7838
 deriva/transfer/download/processors/postprocess/url_post_processor.py,sha256=s68iIYqQSZHtbv4y-fCG8pjhApAeMEG6hYcKx2Pvf5Y,2745
 deriva/transfer/download/processors/query/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 deriva/transfer/download/processors/query/bag_fetch_query_processor.py,sha256=tiQtfuy01YgOFFD5b_sP7TGjMnt0Jqcg2gp1KNWqeLE,5645
-deriva/transfer/download/processors/query/base_query_processor.py,sha256=oM1pbsbpnPV12h3FLtxo8Sp0OCUQYiRhg22AVqf4N50,10327
+deriva/transfer/download/processors/query/base_query_processor.py,sha256=DGvYM4Ykwo5OYq2D-HKB2bYPuqhJMKdMQ8GGw7OCMz0,10393
 deriva/transfer/download/processors/query/file_download_query_processor.py,sha256=Hg1NbKsaGJh9cB86yIyL7Fm7ywSNVop837Dv8aFXUes,7257
 deriva/transfer/download/processors/transform/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 deriva/transfer/download/processors/transform/base_transform_processor.py,sha256=Ddw5gsNpDANeuLvUaF4utp8psaxOtAzlgXtOg8gb-Pc,4109
@@ -85,7 +86,7 @@ deriva/transfer/restore/deriva_restore.py,sha256=s0h7cXit2USSdjrIfrj0dr7BJ0rrHHM
 deriva/transfer/restore/deriva_restore_cli.py,sha256=2ViZ1Lyl5ndXPKeJFCHHGnwzkg3DfHhTuRa_bN7eJm8,5603
 deriva/transfer/upload/__init__.py,sha256=4mlc_iUX-v7SpXzlCZmhxQtSiW5JeDGb2FX7bb1E6tY,304
 deriva/transfer/upload/__main__.py,sha256=hqnXtGpRqPthwpO6uvrnf_TQm7McheeyOt960hStSMY,340
-deriva/transfer/upload/deriva_upload.py,sha256=9NJbsPx1FANgGrCr5AP78AjtM41LJsanCJKEW4UH9ws,60376
+deriva/transfer/upload/deriva_upload.py,sha256=GuQb_-PBKR0JstEifXqSOZpF1zTyaPLfM0PCDlu2Qw8,60500
 deriva/transfer/upload/deriva_upload_cli.py,sha256=-Q6xgiYabQziTQcMQdGNDAv-eLxCCHO-BCSo4umbDE4,5082
 deriva/transfer/upload/processors/__init__.py,sha256=sMM5xdJ82UIRdB1lGMKk7ft0BgtjS2oJ0sI4SQSqiIU,2481
 deriva/transfer/upload/processors/archive_processor.py,sha256=ID0lDwDn4vPe5nbxy6m28Ssj_TsZpK4df2xRrM6nJRQ,2015
@@ -97,10 +98,18 @@ deriva/transfer/upload/tests/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NM
 deriva/utils/__init__.py,sha256=jv2YF__bseklT3OWEzlqJ5qE24c4aWd5F4r0TTjOrWQ,65
 tests/deriva/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/deriva/core/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-tests/deriva/core/test_datapath.py,sha256=hC5PqyL9zqNOV4ydY5L4pHdt8r7Or7OgZnX-F52P2nU,37308
-deriva-1.7.1.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
-deriva-1.7.1.dist-info/METADATA,sha256=WAYjUe8xgfn45OweE56aX8q67MuxaBcdxdkrSRfZfO4,1623
-deriva-1.7.1.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
-deriva-1.7.1.dist-info/entry_points.txt,sha256=72BEmEE4Bes5QhVxUHrl7EvUARrgISWxI2KGa8BbNZ8,786
-deriva-1.7.1.dist-info/top_level.txt,sha256=_LHDie5-O53wFlexfrxjewpVkf04oydf3CqX5h75DXE,13
-deriva-1.7.1.dist-info/RECORD,,
+tests/deriva/core/test_datapath.py,sha256=0vUlQ48KYkDW5L7hzwyGAETa_40y0JmZDalk0W0fCq4,38722
+tests/deriva/core/test_ermrest_model.py,sha256=tmWmAgXTcLBueY4iUS14uq-b1SjgKMaFGt2lw9mYvbg,34330
+tests/deriva/core/mmo/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+tests/deriva/core/mmo/base.py,sha256=3iLqUDNdiJaERB-8-G-5NEvkJr9fz0YUMvPxl5hMINE,9356
+tests/deriva/core/mmo/test_mmo_drop.py,sha256=R_yl-PIHGx-3kchT5TH8O9TJktepWjgs6hHISOc6d2k,8930
+tests/deriva/core/mmo/test_mmo_find.py,sha256=PcUN76sik68B3XKg0G3wHVpKcPEld_6RtbxeGzkrMQ8,4172
+tests/deriva/core/mmo/test_mmo_prune.py,sha256=4pYtYL8g1BgadlewNPVpVA5lT_gV6SPTDYf04ZKzBTA,6851
+tests/deriva/core/mmo/test_mmo_rename.py,sha256=4oSR1G3Od701Ss3AnolI1Z7CbMxKuQF2uSr2_IcoR6s,8512
+tests/deriva/core/mmo/test_mmo_replace.py,sha256=w-66LWyiQ_ajC7Ipmhc4kAKwIloPdQELeUPsvelTdX8,8439
+deriva-1.7.4.dist-info/LICENSE,sha256=tAkwu8-AdEyGxGoSvJ2gVmQdcicWw3j1ZZueVV74M-E,11357
+deriva-1.7.4.dist-info/METADATA,sha256=wzg-6mYMEeNT1hsWxSFcP_1vQOj9mL8CfW1q64rxdJc,1623
+deriva-1.7.4.dist-info/WHEEL,sha256=GJ7t_kWBFywbagK5eo9IoUwLW6oyOeTKmQ-9iHFVNxQ,92
+deriva-1.7.4.dist-info/entry_points.txt,sha256=72BEmEE4Bes5QhVxUHrl7EvUARrgISWxI2KGa8BbNZ8,786
+deriva-1.7.4.dist-info/top_level.txt,sha256=_LHDie5-O53wFlexfrxjewpVkf04oydf3CqX5h75DXE,13
+deriva-1.7.4.dist-info/RECORD,,