notebook render-fn meta data added

clojure-quant · Apr 23, 2024 · 98402d5 · 98402d5
1 parent b3dbc2d
commit 98402d5
Show file tree

Hide file tree

Showing 6 changed files with 21 additions and 0 deletions.
diff --git a/lib/viz/src/ta/viz/ds/hiccup.clj b/lib/viz/src/ta/viz/ds/hiccup.clj
@@ -4,6 +4,7 @@
   "returns a render specification {:render-fn :spec :data} . 
    for hiccup"
   [hiccup]
+  ^{:render-fn 'ta.viz.renderfn/render-spec} ; needed for notebooks
   {:render-fn 'ta.viz.renderfn.hiccup/hiccup
    :data []
    :spec hiccup})
diff --git a/lib/viz/src/ta/viz/ds/highchart.clj b/lib/viz/src/ta/viz/ds/highchart.clj
@@ -16,6 +16,7 @@
   (let [chart-spec (or (:chart spec) {})
         pane-spec (:charts spec)]
     (assert (chart-pane-spec? pane-spec) "please comply with chart-pane-spec")
+    ^{:render-fn 'ta.viz.renderfn/render-spec} ; needed for notebooks
     {:render-fn 'ta.viz.renderfn.highcharts/highstock
      :data (-> bar-algo-ds
                (tc/select-columns (chart-cols pane-spec))

diff --git a/lib/viz/src/ta/viz/ds/metrics.clj b/lib/viz/src/ta/viz/ds/metrics.clj
@@ -21,6 +21,7 @@
                             :location :trade-summary}))))
 
 (defn metrics-render-spec-impl [{:keys [roundtrip-ds nav-ds metrics]}]
+  ^{:render-fn 'ta.viz.renderfn/render-spec} ; needed for notebooks
   {:render-fn 'ta.viz.renderfn.metrics/metrics
    :data {:roundtrips (ds->map roundtrip-ds)
           :nav (ds->map nav-ds)

diff --git a/lib/viz/src/ta/viz/ds/rtable.clj b/lib/viz/src/ta/viz/ds/rtable.clj
@@ -34,6 +34,7 @@
    Specified formats, created from the bar-algo-ds"
   [spec bar-algo-ds]
   (assert (rtable-spec? spec) "rtable-spec needs to have :columns key")
+  ^{:render-fn 'ta.viz.renderfn/render-spec} ; needed for notebooks
   {:render-fn 'ta.viz.renderfn.rtable/rtable
    :data (-> bar-algo-ds
              (tc/select-columns (rtable-cols spec))

diff --git a/lib/viz/src/ta/viz/ds/vega.clj b/lib/viz/src/ta/viz/ds/vega.clj
@@ -10,7 +10,23 @@
 
 (defn vega-render-spec [{:keys [cols spec] :as vega-spec} bar-algo-ds]
   (when bar-algo-ds
+    ^{:render-fn 'ta.viz.renderfn/render-spec} ; needed for notebooks
     {:render-fn 'ta.viz.renderfn.vega/vega-lite
      :data {:values (convert-data bar-algo-ds cols)}
      :spec spec}))
 
+(defn- select-one [ds x col]
+  (-> ds
+      (tc/select-columns [x col])
+      (tc/add-column :name col)
+      (tc/rename-columns {col :y
+                          x :x})))
+
+(defn ds-stacked
+  "produces a dataset with [:x :y :name] columns
+   useful for vega-plots that colorize depending on
+   the series name"
+  [ds x cols]
+  (let [ds-seq (map #(select-one ds x %) cols)]
+    (apply tc/concat ds-seq)))
+
diff --git a/lib/viz/src/ta/viz/error.clj b/lib/viz/src/ta/viz/error.clj
@@ -9,6 +9,7 @@
    plotted with a specified style/position, 
    created from the bar-algo-ds"
   [nom-anomaly]
+  ^{:render-fn 'ta.viz.renderfn/render-spec} ; needed for notebooks
   {:render-fn 'ta.viz.renderfn.error/nom-error
    :data nom-anomaly
    :spec :whatever})