Modularize scanners and add results method

modelscan/cli.py

@@ -5,7 +5,7 @@
 
 import click
 
-from modelscan.modelscan import Modelscan
+from modelscan.modelscan import ModelScan
 from modelscan.reports import ConsoleReport
 from modelscan._version import __version__
 
@@ -61,14 +61,13 @@ def cli(
     if log is not None:
         logger.setLevel(getattr(logging, log))
 
-    modelscan = Modelscan()
+    modelscan = ModelScan()
     if path is not None:
         pathlibPath = Path().cwd() if path == "." else Path(path).absolute()
         if not pathlibPath.exists():
             raise FileNotFoundError(f"Path {path} does not exist")
         else:
-            modelscan.scan_path(pathlibPath)
-
+            modelscan.scan(pathlibPath)
     else:
         raise click.UsageError("Command line must include a path")
     ConsoleReport.generate(

modelscan/issues.py

@@ -21,9 +21,16 @@ class IssueCode(Enum):
 
 
 class IssueDetails(metaclass=abc.ABCMeta):
+    def __init__(self, scanner: str = "") -> None:
+        self.scanner = scanner
+
     @abc.abstractmethod
     def output_lines(self) -> List[str]:
-        raise NotImplemented
+        raise NotImplementedError
+
+    @abc.abstractmethod
+    def output_json(self) -> Dict[str, str]:
+        raise NotImplementedError
 
 
 class Issue:
@@ -110,13 +117,25 @@ def group_by_severity(self) -> Dict[str, List[Issue]]:
 
 
 class OperatorIssueDetails(IssueDetails):
-    def __init__(self, module: str, operator: str, source: Union[Path, str]) -> None:
+    def __init__(
+        self, module: str, operator: str, source: Union[Path, str], scanner: str = ""
+    ) -> None:
         self.module = module
         self.operator = operator
         self.source = source
+        self.scanner = scanner
 
     def output_lines(self) -> List[str]:
         return [
             f"Description: Use of unsafe operator '{self.operator}' from module '{self.module}'",
             f"Source: {str(self.source)}",
         ]
+
+    def output_json(self) -> Dict[str, str]:
+        return {
+            "description": f"Use of unsafe operator '{self.operator}' from module '{self.module}'",
+            "operator": f"{self.operator}",
+            "module": f"{self.module}",
+            "source": f"{str(self.source)}",
+            "scanner": f"{self.scanner}",
+        }