more cleanup and refactoring

SimonBlanke · Jul 7, 2021 · e2677a5 · e2677a5
1 parent 3d3ce22
commit e2677a5
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 9 deletions.
diff --git a/hyperactive/dashboards/progress_board/progress_board.py b/hyperactive/dashboards/progress_board/progress_board.py
@@ -16,7 +16,7 @@ def __init__(self, filter_file=None):
 
         self.uuid = uuid.uuid4().hex
         self.search_ids = []
-        self._io_ = ProgressIO("./", verbosity=False)
+        self._io_ = ProgressIO(verbosity=False)
 
     def create_lock(self, search_id):
         path = self._io_.get_lock_file_path(search_id)

diff --git a/hyperactive/dashboards/progress_board/progress_io.py b/hyperactive/dashboards/progress_board/progress_io.py
@@ -7,8 +7,8 @@
 
 
 class ProgressIO:
-    def __init__(self, path, verbosity=True, warnings=True):
-        self.path = path
+    def __init__(self, verbosity=True, warnings=True):
+        self.path = "./"
         self.verbosity = verbosity
         self.warnings = warnings
 

diff --git a/hyperactive/dashboards/progress_board/run_streamlit.py b/hyperactive/dashboards/progress_board/run_streamlit.py
@@ -50,18 +50,16 @@ def main():
         lock_file = backend._io_.get_lock_file_path(search_id)
         lock_files.append(os.path.isfile(lock_file))
 
-    print("\n lock_files", lock_files, "\n")
-
     time.sleep(1)
     if all(lock_file is False for lock_file in lock_files):
-        print("\n --- Deleting progress-/filter-files ---")
+        print("\n --- Deleting progress- and filter-files --- \n")
 
         for search_id in search_ids:
             backend._io_.remove_progress(search_id)
             backend._io_.remove_filter(search_id)
 
     else:
-        print("\n --- Rerun streamlit ---")
+        print("\n --- Rerun streamlit --- \n")
         st.experimental_rerun()
 
 

diff --git a/hyperactive/dashboards/progress_board/streamlit_backend.py b/hyperactive/dashboards/progress_board/streamlit_backend.py
@@ -25,7 +25,7 @@ def __init__(self, search_ids):
         self.search_ids = search_ids
         self.search_id_dict = {}
 
-        self._io_ = ProgressIO("./")
+        self._io_ = ProgressIO()
 
         for search_id in search_ids:
             self.search_id_dict[search_id] = {}
@@ -120,7 +120,7 @@ def plotly(self, progress_data, search_id):
             color="score",
             color_continuous_scale=color_scale,
         )
-        fig.update_layout(autosize=False, width=1200, height=540)
+        fig.update_layout(width=1200, height=540)
 
         return fig