diff --git a/misp_modules/lib/__init__.py b/misp_modules/lib/__init__.py index 57a2505..c078cf7 100644 --- a/misp_modules/lib/__init__.py +++ b/misp_modules/lib/__init__.py @@ -1 +1,3 @@ +from .vt_graph_parser import * # noqa + all = ['joe_parser', 'lastline_api'] diff --git a/misp_modules/lib/vt_graph_parser/__init__.py b/misp_modules/lib/vt_graph_parser/__init__.py index 2a4d339..abc02c5 100644 --- a/misp_modules/lib/vt_graph_parser/__init__.py +++ b/misp_modules/lib/vt_graph_parser/__init__.py @@ -4,9 +4,5 @@ This module provides methods to import graph from misp. """ -from lib.vt_graph_parser.importers import from_pymisp_response - - -__all__ = [ - "from_pymisp_response" -] +from .helpers import * # noqa +from .importers import * # noqa diff --git a/misp_modules/lib/vt_graph_parser/helpers/__init__.py b/misp_modules/lib/vt_graph_parser/helpers/__init__.py index 336faee..7e0ec86 100644 --- a/misp_modules/lib/vt_graph_parser/helpers/__init__.py +++ b/misp_modules/lib/vt_graph_parser/helpers/__init__.py @@ -2,3 +2,6 @@ This modules provides functions and attributes to help MISP importers. """ + + +all = ["parsers", "rules", "wrappers"] diff --git a/misp_modules/lib/vt_graph_parser/helpers/parsers.py b/misp_modules/lib/vt_graph_parser/helpers/parsers.py index c621595..8ca5745 100644 --- a/misp_modules/lib/vt_graph_parser/helpers/parsers.py +++ b/misp_modules/lib/vt_graph_parser/helpers/parsers.py @@ -4,7 +4,7 @@ This module provides parsers for MISP inputs. """ -from lib.vt_graph_parser.helpers.wrappers import MispAttribute +from vt_graph_parser.helpers.wrappers import MispAttribute MISP_INPUT_ATTR = [ diff --git a/misp_modules/lib/vt_graph_parser/importers/__init__.py b/misp_modules/lib/vt_graph_parser/importers/__init__.py index 129d870..c59197c 100644 --- a/misp_modules/lib/vt_graph_parser/importers/__init__.py +++ b/misp_modules/lib/vt_graph_parser/importers/__init__.py @@ -4,9 +4,4 @@ This module provides methods to import graphs from MISP. """ -from lib.vt_graph_parser.importers.pymisp_response import from_pymisp_response - - -__all__ = [ - "from_pymisp_response" -] +__all__ = ["base", "pymisp_response"] diff --git a/misp_modules/lib/vt_graph_parser/importers/base.py b/misp_modules/lib/vt_graph_parser/importers/base.py index 4d9b855..ed5c0fc 100644 --- a/misp_modules/lib/vt_graph_parser/importers/base.py +++ b/misp_modules/lib/vt_graph_parser/importers/base.py @@ -5,7 +5,7 @@ This module provides a common method to import graph from misp attributes. import vt_graph_api -from lib.vt_graph_parser.helpers.rules import MispEventInitialRule +from vt_graph_parser.helpers.rules import MispEventInitialRule def import_misp_graph( diff --git a/misp_modules/lib/vt_graph_parser/importers/pymisp_response.py b/misp_modules/lib/vt_graph_parser/importers/pymisp_response.py index 86a3b25..e0e834b 100644 --- a/misp_modules/lib/vt_graph_parser/importers/pymisp_response.py +++ b/misp_modules/lib/vt_graph_parser/importers/pymisp_response.py @@ -5,8 +5,8 @@ response payload giving by MISP API directly. """ -from lib.vt_graph_parser.helpers.parsers import parse_pymisp_response -from lib.vt_graph_parser.importers.base import import_misp_graph +from vt_graph_parser.helpers.parsers import parse_pymisp_response +from vt_graph_parser.importers.base import import_misp_graph def from_pymisp_response( diff --git a/misp_modules/modules/export_mod/vt_graph.py b/misp_modules/modules/export_mod/vt_graph.py index d8b3359..70c1952 100644 --- a/misp_modules/modules/export_mod/vt_graph.py +++ b/misp_modules/modules/export_mod/vt_graph.py @@ -3,7 +3,7 @@ import base64 import json -from lib.vt_graph_parser import from_pymisp_response +from vt_graph_parser.importers.pymisp_response import from_pymisp_response misperrors = {