dryad2dataverse 0.7.1__tar.gz → 0.7.4__tar.gz

{dryad2dataverse-0.7.1/src/dryad2dataverse.egg-info → dryad2dataverse-0.7.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dryad2dataverse
-Version: 0.7.1
+Version: 0.7.4
 Summary: Utility for copying and syncing data from a Dryad data repository to a Dataverse repository
 Author-email: Paul Lesack <paul.lesack@ubc.ca>
 Project-URL: Homepage, https://ubc-library-rc.github.io/dryad2dataverse
@@ -20,7 +20,7 @@ Description-Content-Type: text/markdown
 Requires-Dist: certifi>=2022.12.7
 Requires-Dist: charset-normalizer>=2.0.4
 Requires-Dist: chardet>=3.0.4
-Requires-Dist: idna>=2.10
+Requires-Dist: idna>=2.10.0
 Requires-Dist: pycryptodome>=3.20.0
 Requires-Dist: requests>=2.26.0
 Requires-Dist: requests-toolbelt>=0.9.1

{dryad2dataverse-0.7.1 → dryad2dataverse-0.7.4}/requirements.txt

@@ -1,7 +1,7 @@
 certifi>=2022.12.7
 charset-normalizer>=2.0.4
 chardet>=3.0.4
-idna>=2.10
+idna>=2.10.0
 pycryptodome>=3.20.0
 requests>=2.26.0
 requests-toolbelt>=0.9.1

{dryad2dataverse-0.7.1 → dryad2dataverse-0.7.4}/src/dryad2dataverse/__init__.py

@@ -22,7 +22,9 @@ Modules included:
 
     dryad2dataverse.exceptions : Custom exceptions.
 '''
+import sys
 
-VERSION = (0, 7, 1)
-
+VERSION = (0, 7, 4)
 __version__ = '.'.join([str(x) for x in VERSION])
+USERAGENT = (f'dryad2dataverse/v{__version__} ({sys.platform.capitalize()}); '
+             f'Python {sys.version[:sys.version.find("(")-1]}')

{dryad2dataverse-0.7.1 → dryad2dataverse-0.7.4}/src/dryad2dataverse/monitor.py

@@ -325,7 +325,10 @@ class Monitor():
                 # because of code duplication below.
                 for f in oldFiles:
                     #Download links are not persistent. Be warned
-                    downLink = f['_links']['stash:file-download']['href']
+                    try:
+                        downLink = f['_links']['stash:file-download']['href']
+                    except KeyError:
+                        downLink = f['_links']['stash:download']['href']
                     downLink = f'{constants.DRYURL}{downLink}'
                     name = f['path']
                     mimeType = f['mimeType']

{dryad2dataverse-0.7.1 → dryad2dataverse-0.7.4}/src/dryad2dataverse/scripts/dryadd.py

@@ -27,7 +27,7 @@ import dryad2dataverse.serializer
 import dryad2dataverse.transfer
 from dryad2dataverse.handlers import SSLSMTPHandler
 
-VERSION = (0, 5, 3)
+VERSION = (0, 5, 4)
 __version__ = '.'.join([str(x) for x in VERSION])
 
 DRY = 'https://datadryad.org/api/v2'
@@ -485,6 +485,9 @@ def checkwarn(val:int, **kwargs) -> None:
         {'warn_too_many': bool}
 
     '''
+    print(kwargs)
+    #print(vars(kwargs))
+    return
     if not kwargs.get('warn_too_many'):
         return
     if val >= kwargs.get('warn',0):
@@ -495,7 +498,7 @@ def checkwarn(val:int, **kwargs) -> None:
         for logme in kwargs.get('loggers'):
             logme.warning(mess)
         notify(msgtxt=(subject, mess),
-               **vars(kwargs))
+               **kwargs)
         sys.exit()
 
 def verbo(verbosity:bool, **kwargs)->None:
@@ -671,5 +674,23 @@ def main(log='/var/log/dryadd.log', level=logging.WARNING):
         print(f'Error: {err}. Exiting. For details see log at {args.log}.')
         sys.exit()
 
+def main2(log='/var/log/dryadd.log', level=logging.WARNING):
+    '''
+    Main Dryad transfer daemon
+
+    log : str
+        path to logfile
+    level : int
+        log level, usually one of logging.LOGLEVEL (ie, logging.warning)
+    '''
+    #pylint: disable=too-many-branches
+    #pylint: disable=too-many-statements
+    #pylint: disable=too-many-locals
+    parser = argp()
+    args = parser.parse_args()
+    print(args)
+    checkwarn(val=26,
+              loggers=[],
+              **vars(args))
 if __name__ == '__main__':
-    main()
+    main2()

{dryad2dataverse-0.7.1 → dryad2dataverse-0.7.4}/src/dryad2dataverse/serializer.py

@@ -11,11 +11,13 @@ import requests
 from requests.adapters import HTTPAdapter
 
 from  dryad2dataverse import constants
+from dryad2dataverse import USERAGENT
 
 LOGGER = logging.getLogger(__name__)
 #Connection monitoring as per
 #https://stackoverflow.com/questions/16337511/log-all-requests-from-the-python-requests-module
 URL_LOGGER = logging.getLogger('urllib3')
+USER_AGENT = {'User-agent': USERAGENT}
 
 class Serializer():
     '''
@@ -72,6 +74,7 @@ class Serializer():
         try:
             headers = {'accept':'application/json',
                        'Content-Type':'application/json'}
+            headers.update(USER_AGENT)
             doiClean = urllib.parse.quote(self.doi, safe='')
             resp = self.session.get(f'{url}/api/v2/datasets/{doiClean}',
                                     headers=headers, timeout=timeout)
@@ -164,6 +167,7 @@ class Serializer():
                 self._fileJson = []
                 headers = {'accept':'application/json',
                            'Content-Type':'application/json'}
+                headers.update(USER_AGENT)
                 fileList = self.session.get(f'{constants.DRYURL}/api/v2/versions/{self.id}/files',
                                             headers=headers,
                                             timeout=timeout)

{dryad2dataverse-0.7.1 → dryad2dataverse-0.7.4}/src/dryad2dataverse/transfer.py

@@ -2,6 +2,7 @@
 This module handles data downloads and uploads from a Dryad instance to a Dataverse instance
 '''
 
+#TODO harmonize headers instead of hideous copypasta
 import hashlib
 import io
 import json
@@ -18,7 +19,9 @@ from requests_toolbelt.multipart.encoder import MultipartEncoder
 
 from dryad2dataverse import constants
 from dryad2dataverse import exceptions
+from dryad2dataverse import USERAGENT
 
+USER_AGENT = {'User-agent': USERAGENT}
 LOGGER = logging.getLogger(__name__)
 URL_LOGGER = logging.getLogger('urllib3')
 
@@ -85,6 +88,7 @@ class Transfer():
         if not url:
             url = constants.DVURL
         headers = {'X-Dataverse-key': apikey if apikey else constants.APIKEY}
+        headers.update(USER_AGENT)
         bad_test = self.session.get(f'{url}/api/datasets/:persistentId',
                                 headers=headers,
                                 params=params)
@@ -232,6 +236,7 @@ class Transfer():
             else:
                 headers = {'X-Dataverse-key' : constants.APIKEY}
 
+            headers.update(USER_AGENT)
             params = {'persistentId': hdl}
             set_date = self.session.put(f'{url}/api/datasets/:persistentId/citationdate',
                                         headers=headers,
@@ -284,7 +289,7 @@ class Transfer():
         if not apikey:
             apikey = constants.APIKEY
         headers = {'X-Dataverse-key' : apikey}
-
+        headers.update(USER_AGENT)
         targetDv = kwargs.get('targetDv')
         dvpid = kwargs.get('dvpid')
         #dryFid = kwargs.get('dryFid') #Why did I put this here?
@@ -355,7 +360,7 @@ class Transfer():
     @staticmethod
     def _check_md5(infile, dig_type):
         '''
-        Returns the md5 checksum of a file.
+        Returns the hex digest of a file (formerly just md5sum).
 
         ----------------------------------------
         Parameters:
@@ -442,6 +447,7 @@ class Transfer():
 
         if size:
             if size > constants.MAX_UPLOAD:
+                #TOO BIG
                 LOGGER.warning('%s: File %s exceeds '
                                'Dataverse MAX_UPLOAD size. Skipping download.',
                                self.doi, filename)
@@ -485,6 +491,7 @@ class Transfer():
                 if url == i[0]:
                     i[-1] = md5
             LOGGER.debug('Complete download sequence')
+            #This doesn't actually return an md5, just the hash value
             return md5
         except (requests.exceptions.HTTPError,
                 requests.exceptions.ConnectionError) as err:
@@ -560,6 +567,8 @@ class Transfer():
             headers = {'X-Dataverse-key': apikey}
         else:
             headers = self.auth
+
+        headers.update(USER_AGENT)
         params = {'persistentId': study}
         try:
             lock_status = self.session.get(f'{dv_url}/api/datasets/:persistentId/locks',
@@ -608,6 +617,8 @@ class Transfer():
             headers = {'X-Dataverse-key': apikey}
         else:
             headers = self.auth
+
+        headers.update(USER_AGENT)
         params = {'persistentId': study}
         lock_status = self.session.get(f'{dv_url}/api/datasets/:persistentId/locks',
                                        headers=headers,
@@ -641,7 +652,9 @@ class Transfer():
 
     def upload_file(self, dryadUrl=None, filename=None,
                     mimetype=None, size=None, descr=None,
-                    md5=None, studyId=None, dest=None,
+                    hashtype=None,
+                    #md5=None, studyId=None, dest=None,
+                    digest=None, studyId=None, dest=None,
                     fprefix=None, force_unlock=False, timeout=300):
         '''
         Uploads file to Dataverse study. Returns a tuple of the
@@ -668,8 +681,11 @@ class Transfer():
         dest : str
             — Destination dataverse installation url.
               Defaults to constants.DVURL.
+        hashtype: str
+            original Dryad hash type
 
-        md5 : str
+        #md5 : str
+        digest
             — md5 checksum for file.
 
         fprefix : str
@@ -692,6 +708,8 @@ class Transfer():
 
         ----------------------------------------
         '''
+        #return locals()
+        #TODONE remove above
         if not studyId:
             studyId = self.dvpid
         if not dest:
@@ -730,6 +748,7 @@ class Transfer():
         ctype = {'Content-type' : multi.content_type}
         tmphead = self.auth.copy()
         tmphead.update(ctype)
+        tmphead.update(USER_AGENT)
         url = dest + '/api/datasets/:persistentId/add'
         try:
             upload = self.session.post(url, params=params,
@@ -739,9 +758,22 @@ class Transfer():
             upload.raise_for_status()
             self.fileUpRecord.append((fid, upload.json()))
             upmd5 = upload.json()['data']['files'][0]['dataFile']['checksum']['value']
-            if md5 and upmd5 != md5:
+            #Dataverse hash type
+            _type = upload.json()['data']['files'][0]['dataFile']['checksum']['type']
+            if _type.lower() != hashtype.lower():
+                comparator = self._check_md5(upfile, _type.lower())
+            else:
+                comparator = digest
+            #if hashtype.lower () != 'md5':
+            #    #get an md5 because dataverse uses md5s. Or most of them do anyway.
+            #    #One day this will be rewritten properly.
+            #    md5 = self._check_md5(filename, 'md5')
+            #else:
+            #    md5 = digest
+            #if md5 and (upmd5 != md5):
+            if upmd5 != comparator:
                 try:
-                    raise exceptions.HashError(f'md5sum mismatch:\nlocal: {md5}\nuploaded: {upmd5}')
+                    raise exceptions.HashError(f'{_type} mismatch:\nlocal: {comparator}\nuploaded: {upmd5}')
                 except exceptions.HashError as e:
                     LOGGER.exception(e)
                     raise

{dryad2dataverse-0.7.1 → dryad2dataverse-0.7.4/src/dryad2dataverse.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: dryad2dataverse
-Version: 0.7.1
+Version: 0.7.4
 Summary: Utility for copying and syncing data from a Dryad data repository to a Dataverse repository
 Author-email: Paul Lesack <paul.lesack@ubc.ca>
 Project-URL: Homepage, https://ubc-library-rc.github.io/dryad2dataverse
@@ -20,7 +20,7 @@ Description-Content-Type: text/markdown
 Requires-Dist: certifi>=2022.12.7
 Requires-Dist: charset-normalizer>=2.0.4
 Requires-Dist: chardet>=3.0.4
-Requires-Dist: idna>=2.10
+Requires-Dist: idna>=2.10.0
 Requires-Dist: pycryptodome>=3.20.0
 Requires-Dist: requests>=2.26.0
 Requires-Dist: requests-toolbelt>=0.9.1

{dryad2dataverse-0.7.1 → dryad2dataverse-0.7.4}/src/dryad2dataverse.egg-info/requires.txt

@@ -1,7 +1,7 @@
 certifi>=2022.12.7
 charset-normalizer>=2.0.4
 chardet>=3.0.4
-idna>=2.10
+idna>=2.10.0
 pycryptodome>=3.20.0
 requests>=2.26.0
 requests-toolbelt>=0.9.1