Skip to content

Upgrade to clara 0.18.0, use rule builder, fix missing listener method #116

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
alex-dixon wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Upgrade to clara 0.18.0, use rule builder, fix missing listener method #116

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion project.clj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
[org.clojure/spec.alpha "0.1.109"]
[org.clojure/clojurescript "1.9.854"]
[org.clojure/core.async "0.3.442"]
[com.cerner/clara-rules "0.17.0"]
[com.cerner/clara-rules "0.18.0"]
[com.cognitect/transit-clj "0.8.300"]
[com.cognitect/transit-cljs "0.8.239"]
[com.taoensso/sente "1.11.0"]
Expand Down
6 changes: 4 additions & 2 deletions src/cljc/precept/listeners.cljc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,7 +115,8 @@
(add-activations! [listener node activations])
(remove-activations! [listener node activations])
(add-accum-reduced! [listener node join-bindings result fact-bindings])
(remove-accum-reduced! [listener node join-bindings fact-bindings]))
(remove-accum-reduced! [listener node join-bindings fact-bindings])
(fire-activation! [listener activation resulting-operations]))

(deftype TransientFactListener [trace]
l/ITransientEventListener
Expand Down Expand Up @@ -145,7 +146,8 @@
(add-activations! [listener node activations])
(remove-activations! [listener node activations])
(add-accum-reduced! [listener node join-bindings result fact-bindings])
(remove-accum-reduced! [listener node join-bindings fact-bindings]))
(remove-accum-reduced! [listener node join-bindings fact-bindings])
(fire-activation! [listener activation resulting-operations]))

(defn to-transient-session-event-messenger [listener]
[listener]
Expand Down
52 changes: 35 additions & 17 deletions src/cljc/precept/rules.cljc
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,7 +57,7 @@
uniqueness similarly to Datomic. All facts are treated as non-unique and one-to-one
cardinality by default.

:client-schema - Datomic-format schema for non-perstent facts. Precept enforces cardinality
:client-schema - Datomic-format schema for non-persistent facts. Precept enforces cardinality
and uniqueness for attributes in this schema the same way it does for :db-schema. It
serves two main purposes. 1. To define client-side facts as one-to-many or unique. 2. To
allow Precept's API to filter out facts that should not be persisted when writing to a
Expand Down Expand Up @@ -114,6 +114,31 @@
:rule-nses rule-nses#})
(def ~name session-obj#)))))))

#?(:clj
(defmacro mk-session
"Clara's `mk-session` with Precept options.

Returns the session."
[& sources-and-options]
(let [sources (take-while (complement keyword?) sources-and-options)
options-in (apply hash-map (drop-while (complement keyword?) sources-and-options))
impl-sources `['precept.impl.rules]
hierarchy `(schema/init! (select-keys ~options-in [:db-schema :client-schema]))
ancestors-fn `(util/make-ancestors-fn ~hierarchy)
defaults {:fact-type-fn :a
:ancestors-fn ancestors-fn
:activation-group-fn `(util/make-activation-group-fn ~core/default-group)
:activation-group-sort-fn `(util/make-activation-group-sort-fn
~core/groups ~core/default-group)}
options (mapcat identity (merge defaults (dissoc options-in :db-schema :client-schema)))
body (into options (concat sources impl-sources)) ]
`(let [body# `~[~@body]]
(com/mk-session body#)))))

(defn reconstruct-body [properties lhs rhs]
(let [body (concat lhs ['=>] (rest rhs))]
(if properties (cons properties body) body)))

#?(:clj
(defmacro rule
[name & body]
Expand Down Expand Up @@ -145,10 +170,9 @@
(when-not rhs (throw (ex-info (str "Invalid rule " name ". No RHS (missing =>?).") {})))
`(do ~@(for [{:keys [name lhs rhs]} rule-defs]
`(def ~(vary-meta name assoc :rule true :doc doc)
(cond-> ~(dsl/parse-rule* lhs rhs properties {} (meta &form))
~name (assoc :name ~(str (clojure.core/name source-ns-name) "/"
(clojure.core/name name)))
~doc (assoc :doc ~doc)))))))))
~(dsl/build-rule name
(reconstruct-body properties lhs rhs)
(meta &form)) )))))))

#?(:clj
(defmacro defquery
Expand All @@ -168,10 +192,7 @@
rw-lhs (reverse (into '() (macros/rewrite-lhs definition)))]
(core/register-rule {:name name :ns *ns* :type "query" :lhs definition :rhs nil})
`(def ~(vary-meta name assoc :query true :doc doc)
(cond-> ~(dsl/parse-query* binding rw-lhs {} (meta &form))
~name (assoc :name ~(str (clojure.core/name (ns-name *ns*)) "/"
(clojure.core/name name)))
~doc (assoc :doc ~doc)))))))
~(dsl/build-query name (concat [binding] rw-lhs)))))))

#?(:clj
(defmacro define
Expand Down Expand Up @@ -199,10 +220,8 @@
:rhs rhs
:consequent-facts head})]
`(def ~(vary-meta name assoc :rule true :doc doc)
(cond-> ~(dsl/parse-rule* lhs rhs properties {} (meta &form))
~name (assoc :name ~(str (clojure.core/name (ns-name *ns*)) "/"
(clojure.core/name name)))
~doc (assoc :doc ~doc)))))))
~(dsl/build-rule name (reconstruct-body properties lhs rhs)
(meta &form)))))))

#?(:clj
(defmacro defsub
Expand Down Expand Up @@ -238,10 +257,9 @@
:rhs rhs}))]
`(do ~@(for [{:keys [name lhs rhs]} rule-defs]
`(def ~(vary-meta name assoc :rule true :doc doc)
(cond-> ~(dsl/parse-rule* lhs rhs {:group :report} {} (meta &form))
~name (assoc :name ~(str (clojure.core/name (ns-name *ns*)) "/"
(clojure.core/name name)))
~doc (assoc :doc ~doc)))))))))
~(dsl/build-rule name
(reconstruct-body {:group :report} lhs rhs)
(meta &form)))))))))

(def fire-rules clara.rules/fire-rules)

Expand Down