ciocore 8.0.0b22__py2.py3-none-any.whl → 8.0.0b24__py2.py3-none-any.whl

ciocore/VERSION

@@ -1 +1 @@
-8.0.0-beta.22
+8.0.0-beta.24

ciocore/downloader/base_downloader.py

@@ -155,7 +155,6 @@ class BaseDownloader(object):
         client=api_client.ApiClient(),
     ):
         """Initialize the downloader."""
-        logger.debug("Initializing paged downloader")
         self.destination = destination
         self.force = force
         self.num_threads = num_threads
@@ -194,6 +193,7 @@ class BaseDownloader(object):
         logger.debug("Max attempts: %s", self.max_attempts)
         logger.debug("Delay: %s", self.delay)
         logger.debug("Jitter: %s", self.jitter)
+        logger.debug("Regex: %s", self.regex)
 
     def handle_interrupt(self, *args):
         """
@@ -294,7 +294,7 @@ class BaseDownloader(object):
             - file_info (dict): A dictionary containing information about the file to be downloaded.
         
         Returns:
-            - file_done_event: An event indicating the completion status of the download.
+            - file_done_event: A dictionary indicating the completion status of the download.
         """
         filepath = file_info["filepath"]
         attempts_remaining = self.max_attempts

ciocore/downloader/log.py

@@ -1,5 +1,6 @@
 import logging
 import colorlog
+import sys
 LOGGER_NAME = "conductor.download"
 
 LOG_COLORS	={
@@ -69,5 +70,8 @@ class GracefulStreamHandler(colorlog.StreamHandler):
 
 logging.setLoggerClass(GracefulLogger)
 logger = colorlog.getLogger(LOGGER_NAME)
-stream_handler = GracefulStreamHandler()
+stream_handler = GracefulStreamHandler(sys.stdout)
+# Ensure that the handler uses the correct formatter, and only one handler is attached
+while logger.hasHandlers():
+    logger.removeHandler(logger.handlers[0])
 logger.addHandler(stream_handler)

ciocore/downloader/logging_download_runner.py

@@ -46,7 +46,7 @@ class LoggingDownloadRunner(DownloadRunnerBase):
 
     def on_file_done(self, evt):
         if evt["error"]:
-            logger.info(
+            logger.warning(
                 "File done with error: %s:%s:%s %s",
                 evt["job_id"],
                 evt["task_id"],
@@ -75,7 +75,7 @@ class LoggingDownloadRunner(DownloadRunnerBase):
         for job_id, task_id, task in evt["registry"].each():
             if task["completed_files"] < task["filecount"]:
                 logger.warning(
-                    "Task not completed %s:%s: %s/%s files.",
+                    "Task not fully downloaded %s:%s: %s/%s files.",
                     job_id,
                     task_id,
                     task["completed_files"],

ciocore/downloader/reporter.py

@@ -78,11 +78,6 @@ class Reporter(object):
         Callback to run on a task-done event. Report status back to the server.
         """
         if evt["preexisting"]:
-            logger.debug(
-                "Task done, but already existed locally %s:%s. Skip reporting.",
-                evt["job_id"],
-                evt["task_id"],
-            )
             return
         future = self.executor.submit(
             self.report_task_status,
@@ -105,13 +100,6 @@ class Reporter(object):
         logger.debug("Download done. Reporting remaining task statuses to server")
         for job_id, task_id, task in evt["registry"].each():
             if task["completed_files"] < task["filecount"]:
-                logger.warning(
-                    "Task not completed %s:%s: %s/%s files.",
-                    job_id,
-                    task_id,
-                    task["completed_files"],
-                    task["filecount"],
-                )
 
                 future = self.executor.submit(
                     self.report_task_status,

{ciocore-8.0.0b22.dist-info → ciocore-8.0.0b24.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: ciocore
-Version: 8.0.0b22
+Version: 8.0.0b24
 Summary: Core functionality for Conductor's client tools
 Home-page: https://github.com/ConductorTechnologies/ciocore
 Author: conductor

{ciocore-8.0.0b22.dist-info → ciocore-8.0.0b24.dist-info}/RECORD

@@ -1,4 +1,4 @@
-ciocore/VERSION,sha256=ehFj3nT2KeDee27GZhBOrUxzLagr13vP-ndPYdLNKnc,13
+ciocore/VERSION,sha256=SvZSBkgu6AHfeW_MCcfBQgBb7p4fb30DogUYWr9e_Zw,13
 ciocore/__init__.py,sha256=aTP7LeeosQA8BZE67gDV4jgfTK5zxmwZRjiTRu_ZWj0,646
 ciocore/api_client.py,sha256=BTDGXT-59-48SLz3BzP8OtGEhBYDiiEvyytsRUxaK9I,23555
 ciocore/cli.py,sha256=65a74el9SA1TX1wOeCdUdWvYDSO8RONLfotKZFlVeuw,14706
@@ -27,7 +27,7 @@ ciocore/docsite/index.html,sha256=p_Dq_6_8cwZZPDI5zjahfCWUkfbSj14NJtoQFAZv0WI,20
 ciocore/docsite/logo.png,sha256=gArgFFWdw8w985-0TkuGIgU_pW9sziEMZdqytXb5WLo,2825
 ciocore/docsite/objects.inv,sha256=UhlZWOqRV8tA4CzS8HKmk322X-so5ZmIe55155t_7Ls,746
 ciocore/docsite/sitemap.xml,sha256=M_V85zl0y2adRvzJAnoCxlZH_Hl7TLnIb1A-6l_xGmI,109
-ciocore/docsite/sitemap.xml.gz,sha256=iJYBp31ZT2PLUd0yj8OD_tqA8gbuV7EDAQ4QgGX9eho,127
+ciocore/docsite/sitemap.xml.gz,sha256=_8sFRX3xvWcpTtJ-2B1Jtymm9ucS6_z7e0YRgXkMeJU,127
 ciocore/docsite/apidoc/api_client/index.html,sha256=DYVIV4xZRhTEiDJoIRn-76YRjGia_ce6LDss7G2stsE,164621
 ciocore/docsite/apidoc/apidoc/index.html,sha256=NQn8wjapxa7O2IQhsbE7Y-VMfMFL6Tby-L7qIF6K3m4,26171
 ciocore/docsite/apidoc/config/index.html,sha256=1GWkyClM7LJlLBpx07BqCi3xDkU-SKVPjNUEeKuwbNs,72559
@@ -86,15 +86,15 @@ ciocore/docsite/search/search_index.json,sha256=t-RJBVqxWPIzkjKMY9dMfpuwzVnJIeHk
 ciocore/docsite/stylesheets/extra.css,sha256=qgfcao9TEBzf6ieAWN5rPyrea7YM_YgVg5qr4NPrxoU,354
 ciocore/docsite/stylesheets/tables.css,sha256=O2PEwlKC0RfvZCRV9UERqQRvhb6jcqO84PLew0bafF0,3279
 ciocore/downloader/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-ciocore/downloader/base_downloader.py,sha256=1s1U9uuVwZyNsJtonvIvYqundccHDcRlqYtl9bRykVQ,25277
+ciocore/downloader/base_downloader.py,sha256=yyfzpQy8V_W8HQVy-1o1nMoGAQaFgdMRVWD4XKZQJ2w,25273
 ciocore/downloader/daemon_downloader.py,sha256=fZZx6P6AAPdaksW4wkdLCo3TAuJhtJWEl5K26SODeTw,1356
 ciocore/downloader/download_runner_base.py,sha256=RHL3JTytaiHN7GvxBtQbmkgEgrUskkW7NUAIDadczJw,1419
 ciocore/downloader/job_downloader.py,sha256=bAY6-RyNexS4hn8Gj_xMPLYFjBPzrvt6nDAxPbziUEk,5652
 ciocore/downloader/legacy_downloader.py,sha256=1dCkagDoRYliQjGUYD2kAw49TQ-4k2AO592e--UHhf4,52087
-ciocore/downloader/log.py,sha256=jr9mL4MiFUo2BNzX47c9uW8h6VljcWva-hOPPUddpxs,2074
-ciocore/downloader/logging_download_runner.py,sha256=MZAk0tzG4wFVGnSmDJHazNGezFp2xOazYR7xV6zjPmg,2855
+ciocore/downloader/log.py,sha256=G5VAu56WFXD7agitpaQu3kdQpeNBcsXCRKukstzNeWM,2255
+ciocore/downloader/logging_download_runner.py,sha256=iOuW8OvfAYW5MpP9zpUXh94qkWLC0GeG4PDGH7JSqJM,2865
 ciocore/downloader/registry.py,sha256=_JIOuqpWkJkgJGN33nt-DCvqN9Gw3xeFhzPq4RUxIoE,2903
-ciocore/downloader/reporter.py,sha256=RETaMU5vgIaMHiWFsJZx7jfl6CfItE3BGOYmDiXp8Go,4864
+ciocore/downloader/reporter.py,sha256=w1rjIzykUqc0UIBCa83TXll5y7UmLLcI6Q0WwG0njDI,4427
 ciocore/uploader/__init__.py,sha256=hxRFJf5Lo86rtRObFXSjjot8nybQd-SebSfYCbgZwow,24
 ciocore/uploader/_uploader.py,sha256=AaCwRo1rGkdMA-XACx9k4Z73R97ndJUVMemUZNV-Ark,37353
 ciocore/uploader/upload_stats/__init__.py,sha256=Lg1y4zq1i0cwc6Hh2K1TAQDYymLff49W-uIo1xjcvdI,5309
@@ -120,8 +120,8 @@ tests/test_uploader.py,sha256=B1llTJt_fqR6e_V_Jxfw9z73QgkFlEPU87xLYGzt-TQ,2914
 tests/test_validator.py,sha256=2fY66ayNc08PGyj2vTI-V_1yeCWJDngkj2zkUM5TTCI,1526
 tests/mocks/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 tests/mocks/glob.py,sha256=J2MH7nqi6NJOHuGdVWxhfeBd700_Ckj6cLh_8jSNkfg,215
-ciocore-8.0.0b22.dist-info/METADATA,sha256=iVOijzDqZ7X1sSKlg3O6iE2VTapQzTPcgnZ8Gv93rP4,16647
-ciocore-8.0.0b22.dist-info/WHEEL,sha256=iYlv5fX357PQyRT2o6tw1bN-YcKFFHKqB_LwHO5wP-g,110
-ciocore-8.0.0b22.dist-info/entry_points.txt,sha256=cCqcALMYbC4d8545V9w0Zysfg9MVuKWhzDQ2er4UfGE,47
-ciocore-8.0.0b22.dist-info/top_level.txt,sha256=SvlM5JlqULzAz00JZWfiUhfjhqDzYzSWssA87zdJl0o,14
-ciocore-8.0.0b22.dist-info/RECORD,,
+ciocore-8.0.0b24.dist-info/METADATA,sha256=nIMXVhlrSoInwWe3wpLwb4auuokjLTZ_jouP6P7Y9ww,16647
+ciocore-8.0.0b24.dist-info/WHEEL,sha256=iYlv5fX357PQyRT2o6tw1bN-YcKFFHKqB_LwHO5wP-g,110
+ciocore-8.0.0b24.dist-info/entry_points.txt,sha256=cCqcALMYbC4d8545V9w0Zysfg9MVuKWhzDQ2er4UfGE,47
+ciocore-8.0.0b24.dist-info/top_level.txt,sha256=SvlM5JlqULzAz00JZWfiUhfjhqDzYzSWssA87zdJl0o,14
+ciocore-8.0.0b24.dist-info/RECORD,,