Merge pull request #13 from smythi93/main

0.5.1

Author: smythi93

.github/workflows/release.yml

@@ -12,19 +12,30 @@ jobs:
     name: Release push
     runs-on: ubuntu-latest
     steps:
-      - name: Extract version from pyproject.toml
+      - uses: actions/checkout@v4
+      - name: Extract version from __init__.py
         id: get_version
         run: |
-          version=$(grep '^version =' pyproject.toml | sed -E "s/version = ['\"]([^'\"]+)['\"]/\\1/")
+          version=$(grep '__version__' src/sflkit/__init__.py | sed -E 's/^__version__ = "(.+)"$/\1/')
+          echo "Extracted version: $version"
+          if [ -z "$version" ]; then
+            echo "Error: Failed to extract version from __init__.py"
+            exit 1
+          fi
           echo "version=$version" >> $GITHUB_OUTPUT
       - name: Create GitHub release
         env:
           GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
-          tag: ${{ github.ref_name }}
         run: |
-          gh release create "${{ steps.get_version.outputs.version }}" \
+          VERSION="${{ steps.get_version.outputs.version }}"
+          echo "Creating release for version: $VERSION"
+          if [ -z "$VERSION" ]; then
+            echo "Error: Version is empty"
+            exit 1
+          fi
+          gh release create "$VERSION" \
               --repo="$GITHUB_REPOSITORY" \
-              --title="${{ steps.get_version.outputs.version }}" \
+              --title="$VERSION" \
               --generate-notes
   pypi-publish:
     name: Upload release to PyPI

pyproject.toml

@@ -25,7 +25,7 @@ classifiers = [
     "Topic :: Software Development :: Testing"
 ]
 dependencies = [
-    "sflkitlib>=0.2.1",
+    "sflkitlib>=0.2.2",
     "numpy>=2.1.3",
     "matplotlib>=3.10.0",
     "pandas>=2.2.3",

src/sflkit/__init__.py

@@ -6,7 +6,7 @@
 from sflkit.instrumentation.dir_instrumentation import DirInstrumentation
 
 
-__version__ = "0.5.0"
+__version__ = "0.5.1"
 
 
 def instrument_config(conf: Config):

src/sflkit/analysis/analysis_type.py

@@ -1,6 +1,6 @@
+import abc
 import enum
-from abc import abstractmethod
-from typing import List, Type, Optional
+from typing import List, Type, Optional, Any
 
 from sflkit.events.event_file import EventFile
 from sflkit.model.scope import Scope
@@ -43,7 +43,7 @@ def __repr__(self):
 """
 
 
-class AnalysisObject:
+class AnalysisObject(abc.ABC):
     function_finder = None
     loop_finder = None
     branch_finder = None
@@ -58,17 +58,17 @@ def set_finder(function_finder, loop_finder, branch_finder):
     def __init__(self):
         self.suspiciousness: float = 0
         self.last_evaluation: EvaluationResult = EvaluationResult.UNOBSERVED
-        self.hits = dict()
+        self.hits: dict[EventFile, dict[Optional[int], Any]] = dict()
 
     def adjust_weight(self, event_file: EventFile, weight: float):
         pass
 
-    @abstractmethod
+    @abc.abstractmethod
     def serialize(self) -> dict:
         pass
 
     @staticmethod
-    @abstractmethod
+    @abc.abstractmethod
     def deserialize(s: dict) -> "AnalysisObject":
         pass
 
@@ -82,7 +82,7 @@ def __str__(self):
         return f"{self.analysis_type()}"
 
     @staticmethod
-    @abstractmethod
+    @abc.abstractmethod
     def analysis_type() -> AnalysisType:
         raise NotImplementedError()
 
@@ -93,19 +93,19 @@ def analyze(self, passed: List, failed: List):
     def calculate(self):
         pass
 
-    @abstractmethod
+    @abc.abstractmethod
     def finalize(self, passed: List, failed: List):
         raise NotImplementedError()
 
-    @abstractmethod
-    def hit(self, id_, event, scope_: Scope = None):
+    @abc.abstractmethod
+    def hit(self, id_: EventFile, event, scope: Scope = None):
         raise NotImplementedError()
 
-    @abstractmethod
+    @abc.abstractmethod
     def get_suggestion(self):
         raise NotImplementedError()
 
-    @abstractmethod
+    @abc.abstractmethod
     def assign_suspiciousness(self):
         raise NotImplementedError()
 
@@ -114,7 +114,7 @@ def handle(event, events: List[Type]):
         return any(map(lambda e: isinstance(event, e), events))
 
     @staticmethod
-    @abstractmethod
+    @abc.abstractmethod
     def events() -> List[Type]:
         raise NotImplementedError()
 

src/sflkit/analysis/analyzer.py

@@ -1,5 +1,6 @@
 import json
 import os
+from concurrent.futures import ThreadPoolExecutor
 from typing import List, Callable, Set, Dict, Optional, Any, Type
 
 from sflkit.analysis.analysis_type import AnalysisType, AnalysisObject
@@ -42,6 +43,7 @@ def __init__(
         meta_model: Optional[MetaModel] = None,
         model_class: Type[Model] = None,
         parallel: bool = False,
+        workers: int = 4,
     ):
         if (
             relevant_event_files is None
@@ -64,6 +66,7 @@ def __init__(
                 else:
                     model_class = Model
             self.model = model_class(factory)
+        self.workers = workers
         self.paths: Dict[int, os.PathLike] = dict()
         self.max_suspiciousness = 0
         self.min_suspiciousness = 0
@@ -76,7 +79,7 @@ def _analyze(self, event_file):
         self.model.prepare(event_file)
         with event_file:
             for event in event_file.load():
-                event.handle(self.model)
+                event.handle(self.model, event_file)
         self.model.follow_up(event_file)
 
     def _finalize(self):
@@ -87,9 +90,16 @@ def _finalize(self):
     def analyze(self):
         if self.meta:
             raise NotImplementedError("Not implemented for meta/loaded analyzer")
-        for event_file in self.relevant_event_files + self.irrelevant_event_files:
-            self.paths[event_file.run_id] = event_file.path
-            self._analyze(event_file)
+        if self.workers > 1:
+            event_files = self.relevant_event_files + self.irrelevant_event_files
+            for event_file in event_files:
+                self.paths[event_file.run_id] = event_file.path
+            with ThreadPoolExecutor(max_workers=self.workers) as executor:
+                list(executor.map(self._analyze, event_files))
+        else:
+            for event_file in self.relevant_event_files + self.irrelevant_event_files:
+                self.paths[event_file.run_id] = event_file.path
+                self._analyze(event_file)
         self._finalize()
 
     def dump(self, path: os.PathLike, indent: Optional[int] = None):