kibi-core 0.23.0 → 0.26.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "kibi-core",
-  "version": "0.23.0",
+  "version": "0.26.1",
   "private": false,
   "description": "Core Prolog modules and RDF graph logic for Kibi",
   "type": "module",

package/schema/entities.pl

@@ -56,6 +56,9 @@ entity_property(req, exempts_claims, list).
 % Absent reads as default.
 entity_property(req, firmness, atom).
 entity_property(adr, firmness, atom).
+% The weakest evidence level a current requirement accepts: proved, tested,
+% asserted or unverified. Absent: tested when firm, otherwise unverified.
+entity_property(req, required_evidence, atom).
 % Intended outcome of a scenario: success, rejection or error.
 entity_property(scenario, expects, atom).
 
@@ -69,6 +72,8 @@ entity_property(fact, value_string, string).
 entity_property(fact, value_int, integer).
 entity_property(fact, value_number, number).
 entity_property(fact, value_bool, boolean).
+% The exact members of a set fact (value_type set).
+entity_property(fact, value_set, list).
 entity_property(fact, unit, string).
 entity_property(fact, scope, string).
 entity_property(fact, polarity, atom).
@@ -150,6 +155,7 @@ optional_property(req, rationale).
 optional_property(req, exempts_claims).
 optional_property(req, firmness).
 optional_property(adr, firmness).
+optional_property(req, required_evidence).
 optional_property(test, verification_scope).
 optional_property(test, verification_perspective).
 optional_property(test, proof_contract).

package/schema/validation.pl

@@ -108,6 +108,7 @@ is_fact_only_field(value_string).
 is_fact_only_field(value_int).
 is_fact_only_field(value_number).
 is_fact_only_field(value_bool).
+is_fact_only_field(value_set).
 is_fact_only_field(unit).
 is_fact_only_field(scope).
 is_fact_only_field(polarity).
@@ -156,6 +157,8 @@ validate_fact_shape(property_value, Props) :-
     valid_operator(Op),
     memberchk(value_type=VT, Props),
     valid_value_type(VT),
+    ( Op == matches -> VT == string ; true ),
+    ( memberchk(Op, [includes, subset_of, excludes]) -> VT == set ; true ),
     exactly_one_value_field(Props),
     value_type_matches_field(VT, Props),
     valid_optional_fact_enums(Props),
@@ -224,10 +227,10 @@ text_atom(Value, Atom) :- atom(Value), !, Atom = Value.
 text_atom(Value, Atom) :- string(Value), atom_string(Atom, Value).
 
 % valid_operator(+Op)
-valid_operator(Op) :- memberchk(Op, [eq, neq, lt, lte, gt, gte]), !.
+valid_operator(Op) :- memberchk(Op, [eq, neq, lt, lte, gt, gte, matches, includes, subset_of, excludes]), !.
 
 % valid_value_type(+VT)
-valid_value_type(ValueType) :- memberchk(ValueType, [string, int, number, bool]), !.
+valid_value_type(ValueType) :- memberchk(ValueType, [string, int, number, bool, set]), !.
 
 % valid_polarity_in_props(+Props)
 % Validates polarity if present; succeeds if no polarity in props
@@ -299,6 +302,7 @@ is_value_field(value_string).
 is_value_field(value_int).
 is_value_field(value_number).
 is_value_field(value_bool).
+is_value_field(value_set).
 
 % value_type_matches_field(+ValueType, +Props)
 % Ensures that value_type matches the actual value field present
@@ -306,6 +310,7 @@ value_type_matches_field(string, Props) :- memberchk(value_string=_, Props), !.
 value_type_matches_field(int, Props) :- memberchk(value_int=_, Props), !.
 value_type_matches_field(number, Props) :- memberchk(value_number=_, Props), !.
 value_type_matches_field(bool, Props) :- memberchk(value_bool=_, Props), !.
+value_type_matches_field(set, Props) :- memberchk(value_set=_, Props), !.
 
 % valid_origin_in_props(+Props)
 % Entity provenance travels as a JSON object string (or a dict). When present

package/src/certificate_check.pl

@@ -38,6 +38,7 @@
     certificate_rule_edges/1,
     certificate_member_holds/3,
     certificate_members_satisfiable/2,
+    set_texts/2,
     verify_certificates/2,
     kb_verify_certificates_file/2
 ]).
@@ -148,7 +149,7 @@ kind_is(Certificate, Kind) :-
 % Every comparable context: context(Subject, Property, Scope, Domain, Members)
 % or unresolved(Subject, Property, Scope, Reason).  A member is
 % m(FactId, Op, Value, ValidFrom, ValidTo) with the operator already negated
-% for a forbid fact; Domain is int, number, bool or string.
+% for a forbid fact; Domain is int, number, bool, string or set.
 certificate_property_contexts(Contexts) :-
     findall(Fact-tuple(Subject, Property, Op, Type, Value, Unit, Scope, Polarity, From, To),
         (   kb:current_req(Req),
@@ -202,6 +203,8 @@ context_domain(Members, Domain, Reason) :-
     ->  Domain = bool, context_scalar_reason(Members, Reason)
     ;   Types == [string]
     ->  Domain = string, context_scalar_reason(Members, Reason)
+    ;   Types == [set]
+    ->  Domain = set, context_set_reason(Members, Reason)
     ;   Types = [_, _|_]
     ->  Domain = none, Reason = "the facts use different value types"
     ;   Domain = none, Reason = "the value type is not supported"
@@ -225,6 +228,25 @@ context_scalar_reason(Members, Reason) :-
     ;   Reason = none
     ).
 
+% Sets also compare with includes (every member of the bound has the
+% property), subset_of (every member with the property is in the bound) and
+% excludes (no member of the bound has it), but only as requirements: a
+% forbidden one has no single negation among the set operators.  neq beside
+% subset_of or excludes is left unresolved: the finite candidates below decide
+% those only without neq.
+context_set_reason(Members, Reason) :-
+    (   member(_-tuple(_, _, Op, _, _, _, _, Polarity, _, _), Members),
+        (   \+ memberchk(Op, [eq, neq, includes, subset_of, excludes])
+        ;   memberchk(Op, [includes, subset_of, excludes]), Polarity == forbid
+        )
+    ->  Reason = "only eq, neq and a required includes, subset_of or excludes compare set values"
+    ;   member(_-tuple(_, _, neq, _, _, _, _, _, _, _), Members),
+        member(_-tuple(_, _, Bounding, _, _, _, _, _, _, _), Members),
+        memberchk(Bounding, [subset_of, excludes])
+    ->  Reason = "neq beside subset_of or excludes on one set property is not compared"
+    ;   Reason = none
+    ).
+
 context_member(_Domain, Fact-tuple(_, _, Op0, _, Value, _, _, Polarity, From, To), m(Fact, Op, Value, From, To)) :-
     (   Polarity == forbid
     ->  numeric_constraint_negation(c(Op0, _, Value), c(Op, _, _))
@@ -247,6 +269,26 @@ certificate_member_holds(Domain, m(_, Op, Bound, _, _), Value) :-
     ;   Op == neq -> ValueText \== BoundText
     ).
 
+% A set value is the exact set of members with the property: eq holds for
+% the same members in any order, neq for any other set, includes for any set
+% that contains every member of the bound.
+certificate_member_holds(set, m(_, Op, Bound, _, _), Value) :-
+    set_texts(Value, ValueTexts),
+    set_texts(Bound, BoundTexts),
+    (   Op == eq -> ValueTexts == BoundTexts
+    ;   Op == neq -> ValueTexts \== BoundTexts
+    ;   Op == includes -> subtract(BoundTexts, ValueTexts, [])
+    ;   Op == subset_of -> subtract(ValueTexts, BoundTexts, [])
+    ;   Op == excludes -> \+ ( member(Text, ValueTexts), memberchk(Text, BoundTexts) )
+    ).
+
+%% set_texts(+Value, -Texts)
+% The sorted, unique member texts of a set value.
+set_texts(Value, Texts) :-
+    is_list(Value),
+    maplist(text_of, Value, Texts0),
+    sort(Texts0, Texts).
+
 numeric_domain(int).
 numeric_domain(number).
 
@@ -282,6 +324,25 @@ scalar_candidates(string, Members, Candidates) :-
     atomic_list_concat(["kibi:fresh"|Texts], '|', FreshAtom),
     atom_string(FreshAtom, Fresh),
     append(Texts, [Fresh], Candidates).
+scalar_candidates(set, Members, Candidates) :-
+    findall(Texts, (member(m(_, _, Bound, _, _), Members), set_texts(Bound, Texts)), Sets0),
+    sort(Sets0, Sets),
+    findall(Text, (member(Set, Sets), member(Text, Set)), Texts0),
+    sort(Texts0, Texts),
+    atomic_list_concat(["kibi:fresh"|Texts], '|', FreshAtom),
+    atom_string(FreshAtom, Fresh),
+    % The union of every bound satisfies any set of includes facts alone; the
+    % union of the includes bounds is the least set every includes fact
+    % allows, so with subset_of and excludes (and no eq or neq) it is
+    % satisfiable exactly when that union is.
+    includes_union(Members, Included),
+    append(Sets, [Texts, Included, [Fresh]], Candidates).
+
+includes_union(Members, Union) :-
+    findall(Text,
+        (member(m(_, includes, Bound, _, _), Members), set_texts(Bound, Set), member(Text, Set)),
+        Texts),
+    sort(Texts, Union).
 
 property_theorem(Contexts, Numbered, Theorem, Used, Rejected) :-
     findall(Index-Certificate,

package/src/certificates.pl

@@ -27,7 +27,8 @@
     certificate_decision_groups/1,
     certificate_rule_edges/1,
     certificate_member_holds/3,
-    certificate_members_satisfiable/2
+    certificate_members_satisfiable/2,
+    set_texts/2
 ]).
 
 %% kb_write_certificates(+Path, -JsonString)
@@ -121,6 +122,21 @@ model_candidates(string, Members, Candidates) :-
     fresh_text(Bounds, 0, Fresh),
     append(Bounds, [Fresh], Candidates).
 
+model_candidates(set, Members, Candidates) :-
+    findall(Set, (member(m(_, _, Bound, _, _), Members), set_texts(Bound, Set)), Sets0),
+    sort(Sets0, Sets),
+    findall(Text, (member(Set, Sets), member(Text, Set)), Texts0),
+    sort(Texts0, Texts),
+    fresh_text(Texts, 0, Fresh),
+    % The union of every bound satisfies any set of includes facts alone;
+    % the union of the includes bounds alone is the least set they allow,
+    % which subset_of and excludes facts accept when anything does.
+    findall(Text,
+        (member(m(_, includes, Bound, _, _), Members), set_texts(Bound, Set), member(Text, Set)),
+        Included0),
+    sort(Included0, Included),
+    append(Sets, [Texts, Included, [Fresh]], Candidates).
+
 fresh_text(Bounds, Index, Fresh) :-
     format(string(Candidate), "kibi:model:~w", [Index]),
     (   member(Bound, Bounds), text_value(Bound, Candidate)

package/src/checks.pl

@@ -2377,7 +2377,7 @@ property_value_shape_error(Props, "Property value fact missing required field: o
 property_value_shape_error(Props, "Property value fact missing required field: value_type") :-
     memberchk(operator=_, Props),
     \+ memberchk(value_type=_, Props).
-property_value_shape_error(Props, "Property value fact missing value field (value_string, value_int, value_number, or value_bool)") :-
+property_value_shape_error(Props, "Property value fact missing value field (value_string, value_int, value_number, value_bool, or value_set)") :-
     memberchk(value_type=_, Props),
     \+ has_value_field(Props).
 property_value_shape_error(Props, "Property value fact has multiple value fields (should have exactly one)") :-
@@ -2394,17 +2394,20 @@ is_value_field(value_string).
 is_value_field(value_int).
 is_value_field(value_number).
 is_value_field(value_bool).
+is_value_field(value_set).
 
 has_value_field(Props) :- memberchk(value_string=_, Props), !.
 has_value_field(Props) :- memberchk(value_int=_, Props), !.
 has_value_field(Props) :- memberchk(value_number=_, Props), !.
 has_value_field(Props) :- memberchk(value_bool=_, Props), !.
+has_value_field(Props) :- memberchk(value_set=_, Props), !.
 
 % value_type_matches_field(+ValueType, +Props)
 value_type_matches_field(string, Props) :- memberchk(value_string=_, Props), !.
 value_type_matches_field(int, Props) :- memberchk(value_int=_, Props), !.
 value_type_matches_field(number, Props) :- memberchk(value_number=_, Props), !.
 value_type_matches_field(bool, Props) :- memberchk(value_bool=_, Props), !.
+value_type_matches_field(set, Props) :- memberchk(value_set=_, Props), !.
 
 predicate_schema_shape_error(Props, "Predicate schema fact missing required field: predicate_name") :-
     \+ memberchk(predicate_name=_, Props).