669 Add CLI argument to disable progress indicators (#670)

reneSchm · web-flow · commit 054483b09b93 · 2023-06-19T15:13:51.000+02:00
diff --git a/.github/workflows/epidata_main.yml b/.github/workflows/epidata_main.yml
@@ -115,13 +115,13 @@ jobs:
       - name: Dowload Data
         run: |
           mkdir -p data_dl
-          getcasedata -o data_dl
-          getpopuldata -o data_dl
-          getjhdata -o data_dl
-          getdividata -o data_dl
-          getcommutermobility -o data_dl
-          getvaccinationdata -o data_dl
-          gethospitalizationdata -o data_dl
+          getcasedata -o data_dl --no-progress-indicators
+          getpopuldata -o data_dl --no-progress-indicators
+          getjhdata -o data_dl --no-progress-indicators
+          getdividata -o data_dl --no-progress-indicators
+          getcommutermobility -o data_dl --no-progress-indicators
+          getvaccinationdata -o data_dl --no-progress-indicators
+          gethospitalizationdata -o data_dl --no-progress-indicators
       - name: Upload Data
         uses: actions/upload-artifact@v3
         with:
diff --git a/pycode/memilio-epidata/memilio/epidata/getDataIntoPandasDataFrame.py b/pycode/memilio-epidata/memilio/epidata/getDataIntoPandasDataFrame.py
@@ -235,6 +235,7 @@ def cli(what):
     - file-format, choices = ['json', 'hdf5', 'json_timeasstring']
     - out_path
     - no_raw
+    - no_progress_indicators (excluded from dict)
     The default values are defined in default dict.
 
     Depending on what following parser can be added:
@@ -341,9 +342,21 @@ def cli(what):
             '-sd', '--sanitize_data', type=int, default=1,
             help='Redistributes cases of every county either based on regions ratios or on thresholds and population'
         )
-    args = parser.parse_args()
 
-    return vars(args)
+    parser.add_argument(
+        '--no-progress-indicators',
+        help='Disables all progress indicators (used for downloads etc.).',
+        action='store_true')
+
+    args = vars(parser.parse_args())
+    # disable progress indicators globally, if the argument --no-progress-indicators was specified
+    progress_indicator.ProgressIndicator.disable_indicators(
+        args["no_progress_indicators"])
+    # remove the no_progress_indicators entry from the dict
+    # (after disabling indicators, its value is no longer usefull)
+    args.pop("no_progress_indicators")
+
+    return args
 
 
 def append_filename(
