socx-cli 0.13.6__tar.gz → 0.13.8__tar.gz

{socx_cli-0.13.6 → socx_cli-0.13.8}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: socx-cli
-Version: 0.13.6
+Version: 0.13.8
 Summary: System on chip verification and tooling infrastructure.
 Project-URL: Issues, https://github.com/sagikimhi/socx-cli/issues
 Project-URL: Homepage, https://sagikimhi.dev/socx-cli
@@ -28,7 +28,7 @@ Classifier: Topic :: Scientific/Engineering :: Electronic Design Automation (EDA
 Classifier: Topic :: Software Development
 Classifier: Topic :: Utilities
 Requires-Python: >=3.12
-Requires-Dist: anyio>=4.12.1
+Requires-Dist: anyio[trio]>=4.12.1
 Requires-Dist: click
 Requires-Dist: copier~=9.11
 Requires-Dist: declare

{socx_cli-0.13.6 → socx_cli-0.13.8}/pyproject.toml

@@ -29,7 +29,7 @@ socx = 'socx.__main__:main'
 [project]
 name = "socx-cli"
 readme = "README.md"
-version = "0.13.6"
+version = "0.13.8"
 license = "Apache-2.0"
 authors = [{ name = "Sagi Kimhi", email = "sagi.kim5@gmail.com" }]
 maintainers = [{ name = "Sagi Kimhi", email = "sagi.kim5@gmail.com" }]
@@ -82,7 +82,7 @@ dependencies = [
     "pydantic-extra-types>=2.11.0",
     "pydantic-settings>=2.12.0",
     "sqlmodel>=0.0.31",
-    "anyio>=4.12.1",
+    "anyio[trio]>=4.12.1",
 ]
 
 [project.urls]

{socx_cli-0.13.6 → socx_cli-0.13.8}/socx/config/converters.py

@@ -310,8 +310,8 @@ class SymbolConverter(Converter[str | Lazy, Any]):
 
 class CommandConverter(
     Converter[
-        str | Lazy | sh.Command | click.Command | PluginModel,
-        str | Lazy | click.Command,
+        str | Lazy | BaseCommand | click.Command | PluginModel,
+        str | Lazy | click.Command | click.Group,
     ]
 ):
     """Turn module or script references into Rich Click commands."""
@@ -351,7 +351,7 @@ class CommandConverter(
     @overload
     def __call__(
         self,
-        value: sh.Command,
+        value: BaseCommand,
         *args: Any,
         **kwargs: Any,
     ) -> click.Command: ...
@@ -374,10 +374,10 @@ class CommandConverter(
     @_validate
     def __call__(
         self,
-        value: str | Lazy | sh.Command | click.Command | PluginModel,
+        value: str | Lazy | BaseCommand | click.Command | PluginModel,
         *args: Any,
         **kwargs: Any,
-    ) -> Lazy | click.Command | click.Group:
+    ) -> str | Lazy | click.Command | click.Group:
         """Build a Click command from dotted paths or reuse existing ones."""
         if isinstance(value, Lazy):
             if value.casting is self:
@@ -401,9 +401,9 @@ class CommandConverter(
             nonlocal value
 
             if TYPE_CHECKING:
-                value = cast(str | sh.Command | PluginModel, value)
+                value = cast(str | BaseCommand | PluginModel, value)
 
-            if isinstance(value, sh.Command):
+            if isinstance(value, str | BaseCommand):
                 return self._run_shell_script(value, *args)
 
             if isinstance(value, PluginModel) and value.is_script():

{socx_cli-0.13.6 → socx_cli-0.13.8}/socx/core/enums.py

@@ -18,14 +18,19 @@ class AutoNumber(int, enum.ReprEnum):
 
 
 class SettingsFormat(AutoNumber):
-    Ini = ".ini"
     Json = ".json"
     Yaml = ".yaml", ".yml"
     Toml = ".toml"
+    Ini = ".ini"
     Python = ".python"
 
     def __init__(self, extension: str, *extensions: str) -> None:
-        self.extensions = [extension, *extensions]
+        self.extensions = {extension, *extensions}
+
+    @classmethod
+    @cache
+    def all_extensions(cls) -> set[str]:
+        return {extension for member in cls for extension in member.extensions}
 
     @classmethod
     @cache

{socx_cli-0.13.6 → socx_cli-0.13.8}/socx/patterns/singleton/singleton.py

@@ -18,7 +18,7 @@ class _SingletonMeta(type):
         return cls._instances[cls]
 
 
-class Singleton(_SingletonMeta("SingletonMeta", (object,), {})):
+class Singleton(_SingletonMeta("_SingletonMeta", (object,), {})):
     """Mixin class for creating singleton classes.
 
     Extending this class enforces the singleton pattern on the subclass.

{socx_cli-0.13.6 → socx_cli-0.13.8}/socx/regression/progress.py

@@ -1,10 +1,10 @@
 from __future__ import annotations
 
-import anyio
 import logging
 from typing import Any
-from collections import ChainMap
 
+import anyio
+from anyio.abc import TaskStatus
 from rich.progress import (
     Progress as BaseProgress,
     ProgressColumn,
@@ -27,7 +27,6 @@ logger = logging.getLogger(__name__)
 
 class PipelineProgress(BaseProgress):
     def __init__(self, **kwargs: Any) -> None:
-        kwargs = dict(ChainMap(kwargs, dict(speed_estimate_period=10)))
         super().__init__(*self.get_default_columns(), **kwargs)
 
     @classmethod
@@ -60,23 +59,10 @@ class RegressionProgress:
         self,
         include: set[str] | None = None,
         exclude: set[str] | None = None,
+        limiter: anyio.CapacityLimiter | None = None,
     ) -> None:
-        """Update progress tasks and flush log messages while running."""
-        with self.progress:
-            if include is None and exclude is None:
-                async with anyio.create_task_group() as tg:
-                    for obj in self.regression.tests:
-                        tg.start_soon(
-                            self.track_regression,
-                            obj,
-                            name=f"track_{obj.name}_progress",
-                        )
-                    tg.start_soon(
-                        self.regression.start,
-                        name=f"{self.regression.name}",
-                    )
-                return
-
+        self.progress.start()
+        try:
             async with anyio.create_task_group() as tg:
                 for obj in self.regression.tests:
                     if exclude is not None and obj.name in exclude:
@@ -86,54 +72,62 @@ class RegressionProgress:
                         continue
 
                     if isinstance(obj, Regression) and not obj.started:
-                        tg.start_soon(obj.start, name=obj.name)
                         tg.start_soon(
                             self.track_regression,
                             obj,
                             name=f"track_{obj.name}_progress",
                         )
+        finally:
+            self.progress.stop()
 
-    async def track_regression(self, regression: Regression) -> None:
-        finished = 0
-        status = TestStatus.Idle
-        progress = self.progress
+    async def track_regression(
+        self,
+        regression: Regression,
+        limiter: anyio.CapacityLimiter | None = None,
+        task_status: TaskStatus = anyio.TASK_STATUS_IGNORED,
+    ) -> None:
 
-        if regression.id not in self.tasks:
-            self.tasks[regression.id] = progress.add_task(
-                total=len(regression),
-                description=(
-                    f"[gray39]{self._get_task_tag(regression)}: "
-                    f"{regression.status.name}"
-                ),
-            )
+        async with anyio.create_task_group() as tg:
+            if regression.id not in self.tasks:
+                self.tasks[regression.id] = self.progress.add_task(
+                    total=len(regression),
+                    description=(
+                        f"[gray39]{self._get_task_tag(regression)}: "
+                        f"{regression.status.name}"
+                    ),
+                )
+                tg.start_soon(self._track_regression, regression)
+                await tg.start(regression.start, limiter)
+                task_status.started()
 
-        while not progress.finished:
-            if regression.finished:
-                self.update_regression(regression, len(regression))
-                break
+    async def _track_regression(self, regression: Regression) -> None:
+        task = self.progress.tasks[self.tasks[regression.id]]
 
-            prev_status = status
-            prev_finished = finished
-            status = regression.status
-            finished = self._count_statuses(
+        while True:
+            finished = await self._count_statuses(
                 regression,
                 TestStatus.Finished,
                 TestStatus.Terminated,
             )
 
-            if prev_finished != finished or prev_status != status:
-                self.update_regression(regression, finished)
+            if finished != task.completed:
+                await self.update_regression(regression, finished)
+
+            if finished == len(regression):
+                break
 
-            await anyio.sleep(0.5)
+            await anyio.sleep(0.05)
 
-    def advance_regression(self, regression: Regression, n: int) -> None:
+    async def advance_regression(
+        self, regression: Regression, n: int = 1
+    ) -> None:
         progress = self.progress
         tid = self.tasks.get(regression.id)
         if progress is not None and tid is not None:
             task = progress.tasks[tid]
-            self.update_regression(regression, task.completed + n)
+            await self.update_regression(regression, task.completed + n)
 
-    def update_regression(self, regression: Regression, n: int) -> None:
+    async def update_regression(self, regression: Regression, n: int) -> None:
         progress = self.progress
         tid = self.tasks.get(regression.id)
         if progress is not None and tid is not None:
@@ -144,32 +138,37 @@ class RegressionProgress:
                 or regression.is_pending()
                 or regression.is_suspended()
             ):
-                task.description = (
+                description = (
                     f"[gray39]{self._get_task_tag(regression)}: "
                     f"{regression.status.name}"
                 )
             elif regression.is_running():
-                task.description = (
+                description = (
                     f"[yellow]{self._get_task_tag(regression)}: "
                     f"{regression.status.name}"
                 )
             elif regression.finished:
-                task.description = (
+                description = (
                     f"[green]{self._get_task_tag(regression)}: "
                     f"{regression.status.name}"
                 )
             elif regression.terminated:
-                task.description = (
+                description = (
                     f"[red]{self._get_task_tag(regression)}: "
                     f"{regression.status.name}"
                 )
 
-            task.completed = min(n, task.total)
+            completed = min(n, task.total)
+            progress.update(
+                task.id,
+                completed=completed,
+                description=description,
+            )
 
-    def _count_statuses(
+    async def _count_statuses(
         self, regression: Regression, *statuses: TestStatus
     ) -> int:
-        with self.regression.lock:
+        async with self.regression.mutex:
             return sum(
                 1 for test in regression.tests if test.status in statuses
             )