dryad2dataverse 0.7.5__py3-none-any.whl → 0.7.9a0__py3-none-any.whl

dryad2dataverse/__init__.py

@@ -24,7 +24,7 @@ Modules included:
 '''
 import sys
 
-VERSION = (0, 7, 5)
+VERSION = (0, 7, '9a0')
 __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/scripts/dryadd.py

@@ -15,6 +15,7 @@ import logging
 import logging.handlers
 import os
 import pathlib
+import pprint
 import shutil
 import smtplib
 import sys
@@ -28,9 +29,12 @@ import dryad2dataverse.serializer
 import dryad2dataverse.transfer
 from dryad2dataverse.handlers import SSLSMTPHandler
 
-VERSION = (0, 6, 2)
+VERSION = (0, 7, 1)
 __version__ = '.'.join([str(x) for x in VERSION])
 
+USER_AGENT = {'User-agent': dryad2dataverse.USERAGENT}
+
+
 DRY = 'https://datadryad.org/api/v2'
 
 def new_content(serial):
@@ -215,6 +219,7 @@ def get_records(ror: 'str', mod_date=None, verbosity=True, timeout=100):
     '''
     headers = {'accept':'application/json',
                'Content-Type':'application/json'}
+    headers.update(USER_AGENT)
     per_page = 1
     params = {'affiliation' : ror,
               'per_page' : per_page}
@@ -344,6 +349,24 @@ def argp():
                         required=False,
                         dest='log',
                         default='/var/log/dryadd.log')
+    parser.add_argument('--loglevel',
+                        help='Log level of server rotating log. Choose one of '
+                        'debug, info, warning, error or critical. '
+                        'Note: case sensitive. '
+                        'Default: logging.warning.',
+                        required=False,
+                        dest='loglevel',
+                        default='warning',
+                        choices=['debug', 'info', 'warning','error','critical'])
+    parser.add_argument('--email-loglevel',
+                        help='Log level of email log. Choose one of '
+                        'debug, info, warning, error or critical. '
+                        'Note: case sensitive. '
+                        'Default: warning',
+                        required=False,
+                        dest='email_loglevel',
+                        default='warning',
+                        choices=['debug', 'info', 'warning','error','critical'])
     parser.add_argument('-l', '--no_force_unlock',
                         help='No forcible file unlock. Required '
                         'if /lock endpint is restricted',
@@ -389,16 +412,14 @@ def argp():
                         default=5,
                         dest='testlimit')
     parser.add_argument('--version', action='version',
-                        version='%(prog)s '+__version__
-                        +'; dryad2dataverse '+
-                        dryad2dataverse.__version__,
+                        version='dryad2dataverse ' + dryad2dataverse.__version__,
                         help='Show version number and exit')
 
     return parser
 
 def set_constants(args):
     '''
-    Set the appropriate dryad2dataverse constants
+    Set the appropriate dryad2dataverse "constants"
     '''
     dryad2dataverse.constants.DV_CONTACT_EMAIL = args.contact
     dryad2dataverse.constants.DV_CONTACT_ = args.contact
@@ -407,6 +428,8 @@ def set_constants(args):
         dryad2dataverse.constants.DVURL = args.url
     if args.dbase:
         dryad2dataverse.constants.DBASE = args.dbase
+    if args.tmp:
+        dryad2dataverse.constants.TMP = args.tmp
 
 def email_log(mailhost, fromaddr, toaddrs, credentials, port=465, secure=(),
               level=logging.WARNING, timeout=100):
@@ -526,7 +549,31 @@ def verbo(verbosity:bool, **kwargs)->None:
         for key, value in kwargs.items():
             print(f'{key}: {value}')
 
-def main(log='/var/log/dryadd.log', level=logging.WARNING):
+def anonymizer(args: argparse.Namespace) -> dict:
+    '''
+    Redacts sensitive info for the log when parsing arguments and returns a dictionary
+    with cleaner values.
+    '''
+    clean_me = args.__dict__.copy()#Don't work on the real thing!
+    cleanser = {x : 'REDACTED' for x in ['email', 'mailserve',
+                                         'key', 'mailserve',
+                                         'pwd', 'recipients', 
+                                         'user']}
+    clean_me.update(cleanser)
+    return clean_me
+
+def bulklog(message, *logfuncs):
+    '''
+    Convenience logging function
+
+    message : str
+        log message
+    logfuncs: logging.Logger[.debug, .info, etc. method]
+    '''
+    for log in logfuncs:
+        log('%s', message)
+
+def main():
     '''
     Main Dryad transfer daemon
 
@@ -540,16 +587,26 @@ def main(log='/var/log/dryadd.log', level=logging.WARNING):
     #pylint: disable=too-many-locals
     parser = argp()
     args = parser.parse_args()
-    if args.log:
-        log = args.log
-    logger = rotating_log(log, level)
+
+    #Ensure log can be written
+    logpath = pathlib.Path(args.log)
+    if not logpath.parent.exists():
+        os.makedirs(logpath.parent)
 
     set_constants(args)
+
+    logger = rotating_log(args.log,
+                          level=logging.getLevelName(args.loglevel.upper()))
+
     elog = email_log(args.mailserv, args.email, args.recipients,
-                     (args.user, args.pwd), port=args.port)
+                     (args.user, args.pwd), port=args.port,
+                     level = logging.getLevelName(args.email_log_level.upper()))
 
 
     logger.info('Beginning update process')
+    for logme in [elog, logger]:
+        logme.debug('Command line arguments: %s' , pprint.pprint(anonymizer(args)))
+
     monitor = dryad2dataverse.monitor.Monitor(args.dbase)
     #copy the database to make a backup, because paranoia is your friend
     if os.path.exists(dryad2dataverse.constants.DBASE):
@@ -688,7 +745,7 @@ def main(log='/var/log/dryadd.log', level=logging.WARNING):
         elog.info('Completed update process')
         finished = ('Dryad to Dataverse transfers completed',
                     ('Dryad to Dataverse transfer daemon has completed.\n'
-                     f'Log available at: {log}'))
+                     f'Log available at: {args.log}'))
         notify(finished, **vars(args))
 
     except dryad2dataverse.exceptions.DataverseBadApiKeyError as api_err:

{dryad2dataverse-0.7.5.dist-info → dryad2dataverse-0.7.9a0.dist-info}/METADATA

@@ -1,30 +1,40 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.3
 Name: dryad2dataverse
-Version: 0.7.5
+Version: 0.7.9a0
 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
-Project-URL: Documentation, https://ubc-library-rc.github.io/dryad2dataverse
-Project-URL: Repository, https://github.com/ubc-library-rc/dryad2dataverse.git
-Project-URL: Tracker, https://github.com/ubc-library-rc/dryad2dataverse/issues
+License: MIT
 Keywords: Harvard Dataverse,Dataverse,research data management,data repository,Dryad,datadryad.org,dataverse.org
+Author: Paul Lesack
+Author-email: paul.lesack@ubc.ca
+Requires-Python: >=3.9, <4
 Classifier: Development Status :: 4 - Beta
 Classifier: Environment :: Console
 Classifier: Intended Audience :: Education
 Classifier: License :: OSI Approved :: MIT License
+Classifier: Programming Language :: Python :: 3
+Classifier: Programming Language :: Python :: 3.9
+Classifier: Programming Language :: Python :: 3.10
+Classifier: Programming Language :: Python :: 3.11
+Classifier: Programming Language :: Python :: 3.12
+Classifier: Programming Language :: Python :: 3.13
 Classifier: Topic :: Education
 Classifier: Topic :: Internet :: WWW/HTTP :: Site Management
 Classifier: Topic :: Utilities
-Requires-Python: >=3.6
+Requires-Dist: certifi (>=2022.12.7)
+Requires-Dist: chardet (>=3.0.4)
+Requires-Dist: charset-normalizer (>=2.0.4)
+Requires-Dist: idna (>=2.10.0)
+Requires-Dist: pycryptodome (>=3.20.0)
+Requires-Dist: pydoc-markdown (>=4.8.2,<5.0.0)
+Requires-Dist: requests (>=2.26.0)
+Requires-Dist: requests-toolbelt (>=0.9.1)
+Requires-Dist: setuptools (>=80.8.0,<81.0.0)
+Requires-Dist: urllib3 (>=1.26.6)
+Project-URL: Bug Tracker, https://github.com/ubc-library-rc/dryad2dataverse/issues
+Project-URL: Documentation, https://ubc-library-rc.github.io/dryad2dataverse
+Project-URL: Homepage, https://ubc-library-rc.github.io/dryad2dataverse
+Project-URL: Repository, https://github.com/ubc-library-rc/dryad2dataverse.git
 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.0
-Requires-Dist: pycryptodome >=3.20.0
-Requires-Dist: requests >=2.26.0
-Requires-Dist: requests-toolbelt >=0.9.1
-Requires-Dist: urllib3 >=1.26.6
 
 # dryad2dataverse
 
@@ -77,3 +87,4 @@ This very terse description is by no means the entirety of the documentation. Co
 A (much) more user-friendly version of the documentation is available at <https://ubc-library-rc.github.io/dryad2dataverse>, including full `dryadd` documentation and API information.
 
 Or if you've cloned the git repostory above, you can use [mkdocs](https://www.mkdocs.org/) and `mkdocs serve` to have a local server version of the documentation. 
+

dryad2dataverse-0.7.9a0.dist-info/RECORD

@@ -0,0 +1,12 @@
+dryad2dataverse/__init__.py,sha256=3ZL8VNeOtYUFOuYHcZuSGJ5YUjdmZI3Od6kJwRa_uiM,869
+dryad2dataverse/constants.py,sha256=ZfD2N0f742nnP8NPUV0QsDdVVAbrW-3Py8Lg9al1Z5c,1429
+dryad2dataverse/exceptions.py,sha256=oIP1_fSEvLF3HpK6gOYb05vUisY-IAxwXZDeNoAvCPM,1008
+dryad2dataverse/handlers.py,sha256=Xb0vvs1HE92qaK6g-Gu3eyHkLrSwU0-RQjLcl6FZPUY,1487
+dryad2dataverse/monitor.py,sha256=KOyWCpPTZLYRStB-RN0e5kgHTfbxHsByD72K1VtEPP8,26406
+dryad2dataverse/scripts/dryadd.py,sha256=SZfwsl46CBey3tboNdZJ1FBBm8qn5IcHxXm5MgAsa3w,30298
+dryad2dataverse/serializer.py,sha256=DoIjHYKtoH047X5Gd-WUdoLpL-kvTtSAPg-lUElCx8c,33865
+dryad2dataverse/transfer.py,sha256=83tju_o4DSgSkF7JDLsgTpAwm03b0CMb0OjcKAEACuY,37548
+dryad2dataverse-0.7.9a0.dist-info/METADATA,sha256=MB6oPkUsIkdICI_D2LCRMjUbTSeE1xgGvqjBKHr11Cw,3739
+dryad2dataverse-0.7.9a0.dist-info/WHEEL,sha256=b4K_helf-jlQoXBBETfwnf4B04YC67LOev0jo4fX5m8,88
+dryad2dataverse-0.7.9a0.dist-info/entry_points.txt,sha256=P-Wu7phJ2dGqaZT6OzHEgy3I-TXXq_7ad67r--O8IcA,62
+dryad2dataverse-0.7.9a0.dist-info/RECORD,,

{dryad2dataverse-0.7.5.dist-info → dryad2dataverse-0.7.9a0.dist-info}/WHEEL

@@ -1,5 +1,4 @@
 Wheel-Version: 1.0
-Generator: setuptools (75.2.0)
+Generator: poetry-core 2.1.3
 Root-Is-Purelib: true
 Tag: py3-none-any
-

dryad2dataverse-0.7.9a0.dist-info/entry_points.txt

@@ -0,0 +1,3 @@
+[console_scripts]
+dryadd=dryad2dataverse.scripts.dryadd:main
+

dryad2dataverse-0.7.5.dist-info/RECORD

@@ -1,13 +0,0 @@
-dryad2dataverse/__init__.py,sha256=RfOrzdCc9OUYlQfBAapkPy_D_SyHziQTob_N5EqAKEM,865
-dryad2dataverse/constants.py,sha256=ZfD2N0f742nnP8NPUV0QsDdVVAbrW-3Py8Lg9al1Z5c,1429
-dryad2dataverse/exceptions.py,sha256=oIP1_fSEvLF3HpK6gOYb05vUisY-IAxwXZDeNoAvCPM,1008
-dryad2dataverse/handlers.py,sha256=Xb0vvs1HE92qaK6g-Gu3eyHkLrSwU0-RQjLcl6FZPUY,1487
-dryad2dataverse/monitor.py,sha256=KOyWCpPTZLYRStB-RN0e5kgHTfbxHsByD72K1VtEPP8,26406
-dryad2dataverse/serializer.py,sha256=DoIjHYKtoH047X5Gd-WUdoLpL-kvTtSAPg-lUElCx8c,33865
-dryad2dataverse/transfer.py,sha256=83tju_o4DSgSkF7JDLsgTpAwm03b0CMb0OjcKAEACuY,37548
-dryad2dataverse/scripts/dryadd.py,sha256=i_y5V0dLz32_nYUFsKfqD_Nz0HIsr4dLV-PQKKH1GhM,28126
-dryad2dataverse-0.7.5.dist-info/METADATA,sha256=9VL4v5kgaGXdCGMV8x3kUS7LbLdZBJXDy7ZDw_Ybvb4,3299
-dryad2dataverse-0.7.5.dist-info/WHEEL,sha256=OVMc5UfuAQiSplgO0_WdW7vXVGAt9Hdd6qtN4HotdyA,91
-dryad2dataverse-0.7.5.dist-info/entry_points.txt,sha256=9kBsBa5SivAtfAox__vZGL7H-HI7Vd-jGztCh_eIJEc,63
-dryad2dataverse-0.7.5.dist-info/top_level.txt,sha256=0X45AghpKfL69Oc51sRddeiHtq8o-OyOhFX3AMal6YI,16
-dryad2dataverse-0.7.5.dist-info/RECORD,,

dryad2dataverse-0.7.5.dist-info/entry_points.txt

@@ -1,2 +0,0 @@
-[console_scripts]
-dryadd = dryad2dataverse.scripts.dryadd:main

dryad2dataverse-0.7.5.dist-info/top_level.txt

@@ -1 +0,0 @@
-dryad2dataverse