MISP
/
cti-python-stix2
mirror of https://github.com/MISP/cti-python-stix2
2
0
Fork 0
Code Issues Releases Wiki Activity

update guide example, conf.py and remove some unused imports

pull/1/head
Emmanuelle Vargas-Gonzalez 2021-03-01 13:14:03 -05:00
parent e4e6f46089
commit 72a12e96ba
4 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
docs/conf.py
View File

@ -7,7 +7,6 @@ import sys
from sphinx.ext.autodoc import ClassDocumenter from sphinx.ext.autodoc import ClassDocumenter
from stix2.base import _STIXBase from stix2.base import _STIXBase
from stix2.equivalence.graph import GRAPH_WEIGHTS
from stix2.equivalence.object import WEIGHTS from stix2.equivalence.object import WEIGHTS
from stix2.version import __version__ from stix2.version import __version__

11
docs/guide/equivalence.ipynb
View File

@ -4607,20 +4607,11 @@
" ),\n", " ),\n",
"]\n", "]\n",
"\n", "\n",
"\n",
"weights = {\n",
" \"_internal\": {\n",
" \"ignore_spec_version\": False,\n",
" \"versioning_checks\": False,\n",
" \"max_depth\": 1,\n",
" },\n",
"}\n",
"\n",
"memstore1 = MemoryStore(g1)\n", "memstore1 = MemoryStore(g1)\n",
"memstore2 = MemoryStore(g2)\n", "memstore2 = MemoryStore(g2)\n",
"prop_scores = {}\n", "prop_scores = {}\n",
"\n", "\n",
"similarity_result = env.graph_similarity(memstore1, memstore2, prop_scores, **weights)\n", "similarity_result = env.graph_similarity(memstore1, memstore2, prop_scores)\n",
"equivalence_result = env.graph_equivalence(memstore1, memstore2, threshold=60)\n", "equivalence_result = env.graph_equivalence(memstore1, memstore2, threshold=60)\n",
"\n", "\n",
"print(similarity_result)\n", "print(similarity_result)\n",

4
stix2/equivalence/graph/__init__.py
View File

@ -2,9 +2,7 @@
import logging import logging
from ..object import ( from ..object import (
WEIGHTS, _bucket_per_type, _object_pairs, exact_match, WEIGHTS, _bucket_per_type, _object_pairs, object_similarity,
list_reference_check, object_similarity, partial_string_based,
partial_timestamp_based, reference_check,
) )
logger = logging.getLogger(__name__) logger = logging.getLogger(__name__)

4
stix2/equivalence/object/__init__.py
View File

@ -412,7 +412,7 @@ def _versioned_checks(ref1, ref2, ds1, ds2, **weights):
object1, object2, ds1=ds1, ds2=ds2, object1, object2, ds1=ds1, ds2=ds2,
ignore_spec_version=ignore_spec_version, ignore_spec_version=ignore_spec_version,
versioning_checks=versioning_checks, versioning_checks=versioning_checks,
max_depth=max_depth, **weights max_depth=max_depth, **weights,
) )
if ref1 not in results: if ref1 not in results:
results[ref1] = {"matched": ref2, "value": result} results[ref1] = {"matched": ref2, "value": result}
@ -446,7 +446,7 @@ def reference_check(ref1, ref2, ds1, ds2, **weights):
o1, o2, ds1=ds1, ds2=ds2, o1, o2, ds1=ds1, ds2=ds2,
ignore_spec_version=ignore_spec_version, ignore_spec_version=ignore_spec_version,
versioning_checks=versioning_checks, versioning_checks=versioning_checks,
max_depth=max_depth, **weights max_depth=max_depth, **weights,
) / 100.0 ) / 100.0
logger.debug( logger.debug(