Merge pull request #68 from casework/release-0.7.0

Release 0.7.0

Author: ajnelson-nist

Makefile

@@ -88,6 +88,7 @@ check: \
 
 clean:
 	@$(MAKE) \
+	  PYTHON3=$(PYTHON3) \
 	  --directory tests \
 	  clean
 	@rm -f \
@@ -123,5 +124,6 @@ distclean: \
 download: \
   .git_submodule_init.done.log
 	$(MAKE) \
+	  PYTHON3=$(PYTHON3) \
 	  --directory tests \
 	  download

README.md

@@ -16,15 +16,15 @@ This repository can be installed from PyPI or from source.
 ### Installing from PyPI
 
 ```bash
-pip install case_utils
+pip install case-utils
 ```
 
 Users who wish to install from PyPI should be aware that while CASE's ontology is in its pre-1.0.0 release state, backwards-incompatible ontology changes may occur.  This may manifest as [`case_validate`](#case_validate) reporting data review errors after installing an updated `case_utils` version.  Users may wish to pin `case_utils` within any dependent code bases to be less than the next unreleased SEMVER-minor version.  (E.g. if `case_utils` version `0.8.0` is currently available, a newly adopting project might wish to track `case_utils<0.9.0` among its dependencies.)
 
 
 ### Installing from source
 
-Users who wish to install pre-release versions and/or make improvements to the code base should install in this manner. 
+Users who wish to install pre-release versions and/or make improvements to the code base should install in this manner.
 
 1. Clone this repository.
 2. (Optional) Create and activate a virtual environment.

case_utils/__init__.py

@@ -11,6 +11,6 @@
 #
 # We would appreciate acknowledgement if the software is used.
 
-__version__ = "0.6.0"
+__version__ = "0.7.0"
 
 from . import local_uuid  # noqa: F401

case_utils/case_file/__init__.py

@@ -15,7 +15,7 @@
 This module creates a graph object that provides a basic UCO characterization of a single file.  The gathered metadata is among the more "durable" file characteristics, i.e. characteristics that would remain consistent when transferring a file between locations.
 """
 
-__version__ = "0.3.2"
+__version__ = "0.4.0"
 
 import argparse
 import datetime
@@ -25,7 +25,7 @@
 import typing
 import warnings
 
-import rdflib  # type: ignore
+import rdflib
 
 import case_utils
 from case_utils.namespace import (
@@ -82,17 +82,19 @@ def create_file_node(
     :returns: The File Observable Object's node.
     :rtype: rdflib.URIRef
     """
+    node_namespace = rdflib.Namespace(node_prefix)
+
     if node_iri is None:
         node_slug = "file-" + case_utils.local_uuid.local_uuid()
-        node_iri = rdflib.Namespace(node_prefix)[node_slug]
+        node_iri = node_namespace[node_slug]
     n_file = rdflib.URIRef(node_iri)
     graph.add((n_file, NS_RDF.type, NS_UCO_OBSERVABLE.File))
 
     basename = os.path.basename(filepath)
     literal_basename = rdflib.Literal(basename)
 
     file_stat = os.stat(filepath)
-    n_file_facet = rdflib.BNode()
+    n_file_facet = node_namespace["file-facet-" + case_utils.local_uuid.local_uuid()]
     graph.add(
         (
             n_file_facet,
@@ -119,7 +121,9 @@ def create_file_node(
         graph.add((n_file_facet, NS_UCO_OBSERVABLE.modifiedTime, literal_mtime))
 
     if not disable_hashes:
-        n_contentdata_facet = rdflib.BNode()
+        n_contentdata_facet = node_namespace[
+            "content-data-facet-" + case_utils.local_uuid.local_uuid()
+        ]
         graph.add((n_file, NS_UCO_CORE.hasFacet, n_contentdata_facet))
         graph.add(
             (n_contentdata_facet, NS_RDF.type, NS_UCO_OBSERVABLE.ContentDataFacet)
@@ -191,7 +195,7 @@ def create_file_node(
         for key in successful_hashdict._fields:
             if key not in ("md5", "sha1", "sha256", "sha512"):
                 continue
-            n_hash = rdflib.BNode()
+            n_hash = node_namespace["hash-" + case_utils.local_uuid.local_uuid()]
             graph.add((n_contentdata_facet, NS_UCO_OBSERVABLE.hash, n_hash))
             graph.add((n_hash, NS_RDF.type, NS_UCO_TYPES.Hash))
             graph.add(

case_utils/case_sparql_construct/__init__.py

@@ -15,15 +15,15 @@
 This script executes a SPARQL CONSTRUCT query, returning a graph of the generated triples.
 """
 
-__version__ = "0.2.2"
+__version__ = "0.2.3"
 
 import argparse
 import logging
 import os
 import sys
 import typing
 
-import rdflib.plugins.sparql  # type: ignore
+import rdflib.plugins.sparql
 
 import case_utils.ontology
 from case_utils.ontology.version_info import (
@@ -90,7 +90,7 @@ def main() -> None:
             in_graph, built_version=args.built_version
         )
 
-    construct_query_object = rdflib.plugins.sparql.prepareQuery(
+    construct_query_object = rdflib.plugins.sparql.processor.prepareQuery(
         construct_query_text, initNs=nsdict
     )
 

case_utils/case_sparql_select/__init__.py

@@ -26,7 +26,7 @@
 Should a more complex query be necessary, an outer, wrapping SELECT query would let this script continue to function.
 """
 
-__version__ = "0.4.2"
+__version__ = "0.4.3"
 
 import argparse
 import binascii
@@ -35,7 +35,7 @@
 import sys
 
 import pandas as pd  # type: ignore
-import rdflib.plugins.sparql  # type: ignore
+import rdflib.plugins.sparql
 
 import case_utils.ontology
 from case_utils.ontology.version_info import (
@@ -107,7 +107,7 @@ def main() -> None:
 
     tally = 0
     records = []
-    select_query_object = rdflib.plugins.sparql.prepareQuery(
+    select_query_object = rdflib.plugins.sparql.processor.prepareQuery(
         select_query_text, initNs=nsdict
     )
     for (row_no, row) in enumerate(graph.query(select_query_object)):

case_utils/case_validate/__init__.py

@@ -29,7 +29,7 @@
 details.)
 """
 
-__version__ = "0.1.2"
+__version__ = "0.1.3"
 
 import argparse
 import importlib.resources
@@ -39,7 +39,7 @@
 import typing
 
 import pyshacl  # type: ignore
-import rdflib.util  # type: ignore
+import rdflib.util
 
 import case_utils.ontology
 from case_utils.ontology.version_info import (

case_utils/namespace.py

@@ -17,12 +17,14 @@
 To use, add "from case_utils.namespace import *".  Namespace variables starting with "NS_" are imported.  As needs are demonstrated in CASE tooling (both in case_utils and from downstream requests), namespaces will also be imported from rdflib for a consistent "NS_*" spelling.
 """
 
-__version__ = "0.1.0"
+__version__ = "0.2.0"
 
-import rdflib  # type: ignore
+import rdflib
 
-NS_SH = rdflib.SH
+NS_OWL = rdflib.OWL
 NS_RDF = rdflib.RDF
+NS_RDFS = rdflib.RDFS
+NS_SH = rdflib.SH
 NS_XSD = rdflib.XSD
 
 NS_CASE_INVESTIGATION = rdflib.Namespace(
@@ -31,9 +33,13 @@
 NS_CASE_VOCABULARY = rdflib.Namespace(
     "https://ontology.caseontology.org/case/vocabulary/"
 )
+NS_CO = rdflib.Namespace("http://purl.org/co/")
 NS_UCO_ACTION = rdflib.Namespace(
     "https://ontology.unifiedcyberontology.org/uco/action/"
 )
+NS_UCO_CONFIGURATION = rdflib.Namespace(
+    "https://ontology.unifiedcyberontology.org/uco/configuration/"
+)
 NS_UCO_CORE = rdflib.Namespace("https://ontology.unifiedcyberontology.org/uco/core/")
 NS_UCO_IDENTITY = rdflib.Namespace(
     "https://ontology.unifiedcyberontology.org/uco/identity/"