Upgrade to new Mundaneum, fix semantic notebook.

Author: jackrusher

deps.edn

@@ -17,7 +17,7 @@
 
         ;; semantic web goodies and box/arrow graphs
         jackrusher/mundaneum               {:git/url "https://github.com/jackrusher/mundaneum/"
-                                            :git/sha "84476918ee47b66a2d6128e1a90780e52fd2ae44"}
+                                            :git/sha "d2c934a12388d88ddb3e53fef92ec2eef97d6140"}
         arrowic/arrowic                    {:mvn/version "0.1.1"}
 
         ;; 2D drawing routines

notebooks/semantic.clj

@@ -13,22 +13,23 @@
   (:require [clojure.string :as str]
             [nextjournal.clerk :as clerk]
             [nextjournal.clerk.viewer :as v]
-            [mundaneum.query :refer [describe entity label property query]]
+            [applied-science.mundaneum.properties :refer [wdt]]
+            [applied-science.mundaneum.query :refer [describe entity label query]]
             [arrowic.core :as arr]))
 
 ;; Now we can ask questions, like "what is James Clerk Maxwell famous
 ;; for having invented or discovered?"
 
-(query '[:select ?what
-         :where [[?what (wdt :discoverer-or-inventor) (entity "James Clerk Maxwell")]]])
+(query `{:select [?what]
+         :where  [[?what ~(wdt :discoverer-or-inventor) ~(entity "James Clerk Maxwell")]]})
 
-;; The WikiData internal ID `Q1080745` doesn't immediately mean much
+;; The WikiData internal ID `:wd/Q1080745` doesn't immediately mean much
 ;; to a human, so we'll try again by appending `Label` to the end of
 ;; the `?what` logic variable so we can see a human readable label
 ;; that item:
 
-(query '[:select ?whatLabel
-         :where [[?what (wdt :discoverer-or-inventor) (entity "James Clerk Maxwell")]]])
+(query `{:select [?whatLabel]
+         :where  [[?what ~(wdt :discoverer-or-inventor) ~(entity "James Clerk Maxwell")]]})
 
 ;; Ah, better. 😊 This ceremony is required because WikiData uses a
 ;; language-neutral data representation internally, leaving us with an
@@ -37,9 +38,9 @@
 ;; label in every language for which it has been specified in
 ;; WikiData:
 
-(query '[:select ?what ?label
-         :where [[?what (wdt :discoverer-or-inventor) (entity "James Clerk Maxwell")]
-                 [?what rdfs:label ?label]]])
+(query `{:select [?what ?label]
+         :where  [[?what ~(wdt :discoverer-or-inventor) ~(entity "James Clerk Maxwell")]
+                  [?what :rdfs/label ?label]]})
 
 ;; One of the nice things about data encoded as a knowledge graph is
 ;; that we can ask questions that are difficult to pose any other way,
@@ -49,10 +50,10 @@
 ;; invented by anyone who has as one of their occupations "physicist":
 
 (def inventions-and-discoveries
-  (->> (query '[:select ?whatLabel ?whomLabel
-                :where [[?what (wdt :discoverer-or-inventor) ?whom]
-                        [?whom (wdt :occupation) (entity "physicist")]]
-                :limit 500])))
+  (->> (query `{:select [?whatLabel ?whomLabel]
+                :where  [[?what ~(wdt :discoverer-or-inventor) ?whom]
+                         [?whom ~(wdt :occupation) ~(entity "physicist")]]
+                :limit 500})))
 
 ;; ## Tabular data
 
@@ -81,17 +82,19 @@
 ;; language.
 
 (def slavic-place-names
-  (->> (query
-        '[:select *
-          :where [[?ort (wdt :instance-of) / (wdt :subclass-of) * (entity "human settlement")
-                   _ (wdt :country) (entity "Germany")
-                   _ rdfs:label ?name
-                   _ (wdt :coordinate-location) ?lonlat]
-                  :filter ((lang ?name) = "de")
-                  :filter ((regex ?name "(ow|itz)$"))]
-          :limit 1000])
+  (->> `{:select *
+         :where [{?ort {(cat ~(wdt :instance-of) (* ~(wdt :subclass-of))) #{~(entity "human settlement")}
+                        ~(wdt :country) #{~(entity "Germany")}
+                        :rdfs/label #{?name}
+                        ~(wdt :coordinate-location) #{?lonlat}}}
+                 [:filter (= (lang ?name) "de")]
+                 [:filter (regex ?name "(ow|itz)$")]]
+         :limit 1000}
+       query
        ;; cleanup lon-lat formatting for map plot!
-       (mapv #(let [[lon lat] (-> (:lonlat %)
+       (mapv #(let [[lon lat] (-> %
+                                  :lonlat
+                                  :value
                                   (str/replace #"[^0-9 \.]" "")
                                   (str/split #" "))]
                 {:name (:name %) :latitude lat :longitude lon}))))
@@ -114,34 +117,23 @@
                 :data {:values slavic-place-names}}]})
 
 ;; Sometimes the data needs a more customized view. Happily, we can
-;; write arbitrary hiccup to be rendered in Clerk. First, we'll make a
-;; helper function to convert the style of image url we receive from
-;; WikiData into proper Wiki Commons URLs with a fixed width:
-
-(defn wiki-image
-  "Helper that takes an image path `url` and creates a full wikimedia commons URL from it, optionally specifying a particular `width`."
-  ([url width] (str "https://commons.wikimedia.org/w/index.php?title=Special:Redirect/file/"
-                    url
-                    "&width="
-                    width))
-  ([url] (wiki-image url 300)))
-
-;; And now we can use this query to fetch a list of different species
-;; of _Apodiformes_ (swifts and hummingbirds), returning a name,
-;; image, and map of home range for each one.
-
-(->> (query '[:select :distinct ?item ?itemLabel ?pic ?range
-              :where [[?item (wdt :parent-taxon) * (entity "Apodiformes")
-                       _ (wdt :taxon-rank) (entity "species")
-                       _ rdfs:label ?englishName
-                       _ (wdt :image) ?pic
-                       _ (wdt :taxon-range-map-image) ?range]
-                      :filter ((lang ?englishName) = "en")]
-              :limit 10])
+;; write arbitrary hiccup to be rendered in Clerk. We'll use this
+;; query to fetch a list of different species of _Apodiformes_ (swifts
+;; and hummingbirds), returning a name, image, and map of home range
+;; for each one.
+
+(->> (query `{:select-distinct [?item ?itemLabel ?pic ?range]
+              :where [[?item (* ~(wdt :parent-taxon)) ~(entity "Apodiformes")]
+                      [?item ~(wdt :taxon-rank) ~(entity "species")]
+                      [?item :rdfs/label ?englishName]
+                      [?item ~(wdt :image) ?pic]
+                      [?item ~(wdt :taxon-range-map-image) ?range]
+                      [:filter (= (lang ?englishName) "en")]]
+              :limit 11})
      (mapv #(vector :tr
-                    [:td (:itemLabel %)]
-                    [:td [:img {:src (wiki-image (:pic %))}]]
-                    [:td [:img {:src (wiki-image (:range %))}]]))
+                    [:td.w-32 (:itemLabel %)]
+                    [:td [:img.w-80 {:src (:pic %)}]]
+                    [:td [:img.w-80 {:src (:range %)}]]))
      (into [:table])
      clerk/html)
 
@@ -161,10 +153,10 @@
 ;; see all the languages.
 
 (-> (clerk/html
-     (let [data (query '[:select ?itemLabel ?influencedByLabel
-                         :where [[?item (wdt :influenced-by) * (entity "Lisp")
-                                  _ (wdt :influenced-by) ?influencedBy]
-                                 [?influencedBy (wdt :influenced-by) * (entity "Lisp")]]])]
+     (let [data (query `{:select [?itemLabel ?influencedByLabel]
+                         :where [[?item (* ~(wdt :influenced-by)) ~(entity "Lisp")]
+                                 [?item ~(wdt :influenced-by) ?influencedBy]
+                                 [?influencedBy (* ~(wdt :influenced-by)) ~(entity "Lisp")]]})]
        (arr/as-svg
         (arr/with-graph (arr/create-graph)
           (let [vertex (->> (mapcat (juxt :itemLabel :influencedByLabel) data)