runem 0.1.0__py3-none-any.whl → 0.1.1__py3-none-any.whl

runem/VERSION

@@ -1 +1 @@
-0.1.0
+0.1.1

runem/hook_manager.py

@@ -95,6 +95,7 @@ class HookManager:
             job_execute(
                 job_config,
                 running_jobs={},
+                completed_jobs={},
                 config_metadata=config_metadata,
                 file_lists=file_lists,
                 **kwargs,

runem/job_execute.py

@@ -111,6 +111,7 @@ def job_execute_inner(
 def job_execute(
     job_config: JobConfig,
     running_jobs: typing.Dict[str, str],
+    completed_jobs: typing.Dict[str, str],
     config_metadata: ConfigMetadata,
     file_lists: FilePathListLookup,
     **kwargs: Unpack[HookSpecificKwargs],
@@ -127,5 +128,6 @@ def job_execute(
         file_lists,
         **kwargs,
     )
+    completed_jobs[this_id] = running_jobs[this_id]
     del running_jobs[this_id]
     return results

runem/runem.py

@@ -28,7 +28,7 @@ import typing
 from collections import defaultdict
 from datetime import timedelta
 from itertools import repeat
-from multiprocessing.managers import DictProxy, ListProxy, ValueProxy
+from multiprocessing.managers import DictProxy, ValueProxy
 from timeit import default_timer as timer
 from types import TracebackType
 
@@ -41,7 +41,6 @@ from runem.config import load_project_config, load_user_configs
 from runem.config_metadata import ConfigMetadata
 from runem.config_parse import load_config_metadata
 from runem.files import find_files
-from runem.job import Job
 from runem.job_execute import job_execute
 from runem.job_filter import filter_jobs
 from runem.log import error, log, warn
@@ -123,7 +122,7 @@ class DummySpinner(ConsoleRenderable):  # pragma: no cover
 def _update_progress(
     label: str,
     running_jobs: typing.Dict[str, str],
-    seen_jobs: typing.List[str],
+    completed_jobs: typing.Dict[str, str],
     all_jobs: Jobs,
     is_running: ValueProxy[bool],
     num_workers: int,
@@ -134,7 +133,6 @@ def _update_progress(
     Args:
         label (str): The identifier.
         running_jobs (Dict[str, str]): The currently running jobs.
-        seen_jobs (List[str]): Jobs that the function has previously tracked.
         all_jobs (Jobs): All jobs, encompassing both completed and running jobs.
         is_running (ValueProxy[bool]): Flag indicating if jobs are still running.
         num_workers (int): Indicates the number of workers performing the jobs.
@@ -146,47 +144,25 @@ def _update_progress(
     else:
         spinner = DummySpinner()
 
-    with rich_console.status(spinner):
-
-        # The set of all job labels, and the set of completed jobs
-        all_job_names: typing.Set[str] = {Job.get_job_name(job) for job in all_jobs}
-        completed_jobs: typing.Set[str] = set()
-
-        # This dataset is used to track changes between iterations
-        last_running_jobs_set: typing.Set[str] = set()
+    last_running_jobs_set: typing.Set[str] = set()
 
+    with rich_console.status(spinner):
         while is_running.value:
             running_jobs_set: typing.Set[str] = set(running_jobs.values())
-            seen_jobs = list(running_jobs_set.union(seen_jobs))  # Update the seen jobs
-
-            # Jobs that have disappeared since last check
-            disappeared_jobs: typing.Set[str] = last_running_jobs_set - running_jobs_set
-
-            # Jobs that have not yet completed
-            remaining_jobs: typing.Set[str] = all_job_names - completed_jobs
 
-            # Check if we're closing to completion
-            workers_retiring: bool = len(remaining_jobs) <= num_workers
-
-            if workers_retiring:
-                # Handle edge case: a task may have disappeared whilst process was sleeping
-                all_completed_jobs: typing.Set[str] = all_job_names - remaining_jobs
-                disappeared_jobs.update(all_completed_jobs - running_jobs_set)
-
-            completed_jobs.update(disappeared_jobs)
-
-            # Prepare progress report
+            # Progress report
             progress: str = f"{len(completed_jobs)}/{len(all_jobs)}"
-            running_jobs_list = printable_set(running_jobs_set)
+            running_jobs_list = printable_set(
+                running_jobs_set
+            )  # Reflect current running jobs accurately
+            report: str = f"{label}: {progress}({num_workers}): {running_jobs_list}"
             if show_spinner:
-                spinner.text = (
-                    f"{label}: {progress}({num_workers}): {running_jobs_list}"
-                )
-
-            # Update the tracked dataset for the next iteration
-            last_running_jobs_set = running_jobs_set
+                spinner.text = report
+            else:
+                if last_running_jobs_set != running_jobs_set:
+                    rich_console.log(report)
 
-            # Sleep to decrease frequency of updates and reduce CPU usage
+            # Sleep for reduced CPU usage
             time.sleep(0.1)
 
 
@@ -225,8 +201,8 @@ def _process_jobs(
     subprocess_error: typing.Optional[BaseException] = None
 
     with multiprocessing.Manager() as manager:
-        seen_jobs: ListProxy[str] = manager.list()
         running_jobs: DictProxy[typing.Any, typing.Any] = manager.dict()
+        completed_jobs: DictProxy[typing.Any, typing.Any] = manager.dict()
         is_running: ValueProxy[bool] = manager.Value("b", True)
 
         terminal_writer_process = multiprocessing.Process(
@@ -234,7 +210,7 @@ def _process_jobs(
             args=(
                 phase,
                 running_jobs,
-                seen_jobs,
+                completed_jobs,
                 jobs,
                 is_running,
                 num_concurrent_procs,
@@ -251,6 +227,7 @@ def _process_jobs(
                     zip(
                         jobs,
                         repeat(running_jobs),
+                        repeat(completed_jobs),
                         repeat(config_metadata),
                         repeat(file_lists),
                     ),

{runem-0.1.0.dist-info → runem-0.1.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: runem
-Version: 0.1.0
+Version: 0.1.1
 Summary: Awesome runem created by lursight
 Home-page: https://github.com/lursight/runem/
 Author: lursight

{runem-0.1.0.dist-info → runem-0.1.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-runem/VERSION,sha256=6d2FB_S_DG9CRY5BrqgzrQvT9hJycjNe7pv01YVB7Wc,6
+runem/VERSION,sha256=gERzFlKfxiAU-6oEf7Z8Uaww4ygwzaNwQFNJ2NZtGWw,6
 runem/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 runem/__main__.py,sha256=dsOiVZegpfK9JOs5n7UmbX5iwwbj7iFkEbLoVeEgAn4,136
 runem/base.py,sha256=EZfR7FIlwEdU9Vfe47Wk2DOO8GQqpKxxLNKp6YHueZ4,316
@@ -9,10 +9,10 @@ runem/config.py,sha256=y-e6j84FDiLSKKw9ShDzRlnS5t2e81MW8fKSKtxtJtg,5935
 runem/config_metadata.py,sha256=Vy7dx8F-Z5jEp16OP2y6vHHoGkyhoCaTG4KIVkMWR7M,3232
 runem/config_parse.py,sha256=6mCamzWu7HTotmqFJmLZg9FFE6qe1-rpmo8_v5ESPW8,13401
 runem/files.py,sha256=QZqPS7OA98lEwlhJNtnaSWlEeTlI8_yn-zjf3QAPoJk,4384
-runem/hook_manager.py,sha256=rhQ4bEWSbn7cfLFtIxJwtaiDe7v1ykvUzmpk9BpZFlM,4241
+runem/hook_manager.py,sha256=8zbMuY4FTSm4kDk2wLBa60zl9NfavnmcOR-qL5jhKTc,4276
 runem/informative_dict.py,sha256=U7p9z78UwOT4TAfng1iDXCEyeYz6C-XZlx9Z1pWNVrI,1548
 runem/job.py,sha256=QVXvzz67fJk__-h0womFQsB80-w41E3XRcHpxmRnv3o,2912
-runem/job_execute.py,sha256=M3hV83SKQMl2kOzVghwbUEYa9B2cQNJR7ixOgxNuWKA,4146
+runem/job_execute.py,sha256=eUyvmtjFdJ49AaIOtqJbRXinkF_UFuz20vBGVrYvt0U,4241
 runem/job_filter.py,sha256=fuxyKCHpTB4HlT_QagBk-IhhmWMlOr9Y9s5voP4yzYU,5370
 runem/job_runner_simple_command.py,sha256=jxBukPm9bTLNhfQCkqNG5VepvB2ysmWAZwhBPHoTA6o,1091
 runem/job_wrapper.py,sha256=H57b52Apcg3q3LyMxus6vNrlv615J4CXiWaQrv8vOgY,936
@@ -21,13 +21,13 @@ runem/log.py,sha256=dIrocigvIJs1ZGkAzTogXkAK-0ZW3q5FkjpDgLdeW-E,630
 runem/py.typed,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
 runem/report.py,sha256=IBCtMgGwnvVbEEqDWbYBGUZmTIzBLnpXqYSK5uu3vgk,8987
 runem/run_command.py,sha256=Egl_j4bJ9mwi2JEFCsl0W6WH2IRgIdpMN7qdj8voClQ,6386
-runem/runem.py,sha256=IINSRvp0Yytzh-VNY98hPGmxrjyOndSeH0D2eEuyYZA,14303
+runem/runem.py,sha256=TPBVLiZwEAmKNoQZVHBrrMVgHQfcsJM4uVY9lrrp8X8,13207
 runem/runem_version.py,sha256=MbETwZO2Tb1Y3hX_OYZjKepEMKA1cjNvr-7Cqhz6e3s,271
 runem/types.py,sha256=-RHnskpWEtvqNlrHx3mHrkx6ujEdkCxcU7hu3_lHrJU,10671
 runem/utils.py,sha256=3N_kel9LsriiMq7kOjT14XhfxUOgz4hdDg97wlLKm3U,221
-runem-0.1.0.dist-info/LICENSE,sha256=awOCsWJ58m_2kBQwBUGWejVqZm6wuRtCL2hi9rfa0X4,1211
-runem-0.1.0.dist-info/METADATA,sha256=PsBSJX4jHev1NegY-LOjmemYGFFAOR8OUY1-nf2mybE,5842
-runem-0.1.0.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
-runem-0.1.0.dist-info/entry_points.txt,sha256=nu0g_vBeuPihYtimbtlNusxWovylMppvJ8UxdJlJfvM,46
-runem-0.1.0.dist-info/top_level.txt,sha256=gK6iqh9OfHDDpErioCC9ul_zx2Q5zWTALtcuGU7Vil4,6
-runem-0.1.0.dist-info/RECORD,,
+runem-0.1.1.dist-info/LICENSE,sha256=awOCsWJ58m_2kBQwBUGWejVqZm6wuRtCL2hi9rfa0X4,1211
+runem-0.1.1.dist-info/METADATA,sha256=Eve8gICbiXMPHxQUUtXqB7hU7Dgjq5Gaq-whnLvzCtk,5842
+runem-0.1.1.dist-info/WHEEL,sha256=R06PA3UVYHThwHvxuRWMqaGcr-PuniXahwjmQRFMEkY,91
+runem-0.1.1.dist-info/entry_points.txt,sha256=nu0g_vBeuPihYtimbtlNusxWovylMppvJ8UxdJlJfvM,46
+runem-0.1.1.dist-info/top_level.txt,sha256=gK6iqh9OfHDDpErioCC9ul_zx2Q5zWTALtcuGU7Vil4,6
+runem-0.1.1.dist-info/RECORD,,