Skip to content

update filedigest for clowder v2 #29

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 4 commits into
base: main
Choose a base branch
from
Open

update filedigest for clowder v2 #29

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
55d2c34
calling different method to generate metadata for v2
tcnichol Feb 15, 2023
934e02a
default to version 1.0
tcnichol Feb 16, 2023
701d23c
no need for explicit construction of metadata
tcnichol Feb 20, 2023
16ceab4
version not used in extractor
tcnichol Feb 20, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 5 additions & 12 deletions digest/ncsa.file.digest.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ def hash_data(data):

def process_message(self, connector, host, secret_key, resource, parameters):
logger = logging.getLogger('__main__')
download_url = pyclowder.files.get_download_url(connector, host, secret_key, resource['id'])
url = '%sapi/files/%s/blob?key=%s' % (host, resource['id'], secret_key)

# Prepare hash objects
Expand All @@ -71,9 +72,9 @@ def process_message(self, connector, host, secret_key, resource, parameters):
# stream data and compute hash
logger.debug("sending request for digest streaming: "+url)
if os.getenv('STREAM', '').lower() == 'pycurl':
self.stream_pycurl(connector, url, hashes)
self.stream_pycurl(connector, download_url, hashes)
else:
self.stream_requests(connector, url, hashes)
self.stream_requests(connector, download_url, hashes)

# Generate final hex hash
hash_digest = {}
Expand All @@ -85,20 +86,12 @@ def process_message(self, connector, host, secret_key, resource, parameters):
for alg in self.hash_list:
hash_context[alg] = "http://www.w3.org/2001/04/xmldsig-more#%s" % alg

# store results as metadata
metadata = {
"@context": ["https://clowder.ncsa.illinois.edu/contexts/metadata.jsonld", hash_context],
"dataset_id": resource['parent'].get('id', None),
"content": hash_digest,
"agent": {
"@type": "cat:extractor",
"extractor_id": host + "api/extractors/" + self.extractor_info['name']
}
}
metadata = self.get_metadata(hash_digest, 'file', resource['id'], host, contexts=[hash_context])

pyclowder.files.upload_metadata(connector, host, secret_key, resource['id'], metadata)


if __name__ == "__main__":
extractor = FileDigestCalculator()
extractor.start()