services in extension.edn

clojure-quant · Sep 9, 2023 · c10617e · c10617e
1 parent e17dd05
commit c10617e
Show file tree

Hide file tree

Showing 14 changed files with 76 additions and 60 deletions.
diff --git a/app/demo/deps.edn b/app/demo/deps.edn
@@ -39,7 +39,7 @@
         }
 
   :docs ; RUN SERVICES (keep running)
-  {:extra-deps {org.pinkgorilla/goldly-docs {:mvn/version "0.4.613"}
+  {:extra-deps {org.pinkgorilla/goldly-docs {:mvn/version "0.4.614"}
                 com.fzakaria/slf4j-timbre {:mvn/version "0.4.0"}}
    :extra-paths ["target/webly" ; to include the sci-bindings info
                  "node_modules"

diff --git a/app/demo/src/demo/algo/joseph.clj b/app/demo/src/demo/algo/joseph.clj
@@ -3,15 +3,13 @@
    [tablecloth.api :as tc]
    [tick.core :as t]
    [ta.helper.date :refer [parse-date epoch-second->datetime ->epoch-second ]]
-   [joseph.trades :refer [load-trades]]
    [ta.algo.manager :refer [add-algo]]
    [ta.tradingview.chart.plot :refer [plot-type linestyle]]
    [ta.tradingview.chart.shape :as shapes2] 
    [ta.tradingview.chart.color :refer [color]]
+   [joseph.trades :refer [load-trades]]
    ))
 
-
-
 (defn trade-filter-symbol [symbol trades]
   (filter #(= (:symbol %) symbol) trades))
 

diff --git a/app/demo/src/demo/goldly/view/vega_list.cljs b/app/demo/src/demo/goldly/view/vega_list.cljs
@@ -3,7 +3,8 @@
    [ui.vega.plot :refer [list-plot]]))
 
 (defn vega-list-plot [data]
-  [:div
+  ^:R 
+   [:div
    [:h1 "vega-list-plot"]
    [:div.flex.flex-row.content-between
     [:div.flex.flex-col.justify-start
@@ -15,3 +16,11 @@
                  :plot-range [:all :all]
                  :opacity 0.5})]]])
 
+
+(comment 
+
+   (vega-list-plot [1 2 3 2 1 2 3 4 5 3 2 1 2 5 3])
+
+ ;
+ )
+
diff --git a/app/demo/src/services-docs.edn b/app/demo/src/services-docs.edn
@@ -49,10 +49,6 @@
                   :middleware cider.nrepl.middleware/cider-middleware
                   :handler cider.nrepl/cider-nrepl-handler)
           :stop (.close this)}
-
-  :clj-services {:start (goldly.service.expose/start-services
-                         (:clj-services (deref (clip/ref :config))))
-                 :stop (goldly.service.expose/stop-services this)}
 
   :scheduler {:start (ta.data.scheduler/start!
                       (clip/ref :timbre))

diff --git a/app/demo/src/ta-config.edn b/app/demo/src/ta-config.edn
@@ -19,8 +19,7 @@
  :goldly {:lazy true
           :src-dir "src"
 ; runtime
-          :autoload-cljs-dir ["ta/tradingview/goldly/page"
-                              "demo/goldly/page"]
+          :autoload-cljs-dir ["demo/goldly/page"]
           :routes {:app {"" :user/main
                          "test" :user/test
 ;warehouse
@@ -48,7 +47,7 @@
                        :studies [:clj "notebook/studies/"]
                        :datascience [:clj "notebook/datascience/"]
                        :playground [:clj "notebook/playground/"]
-                       :demo [:clj "demo/notebook/"]
+                       ;:demo [:clj "demo/notebook/"]
                        :test [:cljs "demo/goldly/view/"]}}
 
  :ta {:warehouse {:list "../resources/symbollist/"
@@ -75,36 +74,6 @@
                     :template-path "../resources/tradingview-templates/"
                     :marks-path "../../data/"}}
 
- :clj-services {:name "trateg services"
-                :symbols [; warehouse
-                          ta.warehouse.symbollist/get-lists
-                          ta.warehouse.symbollist/load-list
-                          ta.warehouse.overview/overview-map
-                          ; data
-                          ta.data.load/load-series
-                          ; algo
-                          ta.algo.manager/algo-names
-                          ta.algo.manager/algo-info
-                          ta.algo.manager/tradingview-algo-chart-specs
-                          ta.algo.manager/algo-run-window-browser
-                          ta.algo.manager/algo-run-browser
-                          ta.algo.manager/algo-marks
-                          ta.algo.manager/algo-shapes
-                          ; tradingview api (via websocket)
-                          ta.tradingview.handler-datasource/get-server-config
-                          ta.tradingview.handler-datasource/symbol-info
-                          ta.tradingview.handler-datasource/symbol-search
-                          ta.tradingview.handler-datasource/server-time
-                          ; gann
-                          ta.gann.db/load-gann
-                          ta.gann.db/save-gann
-                          ta.gann.svg-plot/gann-svg-web
-                          ta.gann.svg-plot/get-boxes
-                          ; joseph
-                          demo.algo.joseph/load-trades
-                          ; testing
-                          ta.helper.date/now-datetime]
-                :permission  #{}}
 
  :demo {:gann-data-file "../resources/gann.edn"}
 ;

diff --git a/lib/gann/deps.edn b/lib/gann/deps.edn
@@ -1,4 +1,6 @@
-{:paths ["src"]
+{:paths ["src"
+         "resources" ; extension data
+         ]
  :deps {org.clojure/clojure {:mvn/version "1.11.1"}
         io.github.adam-james-v/svg-clj {:mvn/version "0.0.11"}
         cljplot/cljplot {:mvn/version "0.0.3"}

diff --git a/lib/gann/resources/ext/gann.edn b/lib/gann/resources/ext/gann.edn
@@ -0,0 +1,12 @@
+{:name "gann"
+ ; runtime
+ :clj-services {:name "gann"
+                :permission #{:dev}
+                :symbols [; gann
+                          ta.gann.db/load-gann
+                          ta.gann.db/save-gann
+                          ta.gann.svg-plot/gann-svg-web
+                          ta.gann.svg-plot/get-boxes]}
+
+ }
+
diff --git a/lib/joseph/resources/ext/joseph.edn b/lib/joseph/resources/ext/joseph.edn
@@ -1,7 +1,11 @@
 {:name "joseph"
  ; runtime
- :api-routes {"joseph/" {:post  {"upload" joseph.upload/wrapped-save-file}
-
-                     }
-              }}
+ :api-routes {"joseph/" {:post  {"upload" joseph.upload/wrapped-save-file}}}
+ :clj-services {:name "joseph"
+                :permission #{:dev}
+                :symbols [joseph.nav/calc-nav
+                          joseph.trades/load-trades]}
+
+ :autoload-cljs-dir ["joseph/page"]
+ }
 
diff --git a/app/demo/src/demo/goldly/page/joseph.cljs → lib/joseph/src/joseph/page/tradingview.cljs b/app/demo/src/demo/goldly/page/joseph.cljs → lib/joseph/src/joseph/page/tradingview.cljs
@@ -1,4 +1,4 @@
-(ns demo.goldly.page.joseph
+(ns joseph.page.tradingview
   (:require
    [reagent.core :as r]
    [cljc.java-time.local-date-time :as ldt]
@@ -14,7 +14,6 @@
    [ta.tradingview.goldly.algo.context :as c]
    [ta.tradingview.goldly.algo.tradingview :refer [tradingview-algo]]
    [ta.tradingview.goldly.page.tradingview-algo :refer []]
-
    [ta.tradingview.goldly.interact :refer [tv-widget-atom]]
    [ta.tradingview.goldly.interact2 :refer [goto-date!]]
    ))
@@ -128,7 +127,7 @@
 (defn trades-view []
   (let [trades (r/atom {})]
     (fn []
-      (clj->a trades 'demo.algo.joseph/load-trades)
+      (clj->a trades 'joseph.trades/load-trades)
       [:div.w-full.h-full
        ;[:h1.text-bold.bg-green-500 "Bars for symbol: " s " f: " f]
        (case (:status @trades)

diff --git a/lib/tradingview/deps.edn b/lib/tradingview/deps.edn
@@ -1,5 +1,5 @@
 {:paths ["src"
-         "resources" ; tradingview javascript library
+         "resources" ; tradingview javascript library +  extension data
          ]
  :deps {org.clojure/clojure    {:mvn/version "1.11.1"}
         tick/tick {:mvn/version "0.6.2"}

diff --git a/lib/tradingview/resources/ext/tradingview.edn b/lib/tradingview/resources/ext/tradingview.edn
@@ -15,6 +15,15 @@
                                                ; :put ta.tradingview.handler-storage/ 
                                                ; :delete ta.tradingview.handler-storage/
                                                }}}}
+ :clj-services {:name "tradingview"
+                :permission #{}
+                :symbols [; tradingview api (via websocket)
+                          ta.tradingview.handler-datasource/get-server-config
+                          ta.tradingview.handler-datasource/symbol-info
+                          ta.tradingview.handler-datasource/symbol-search
+                          ta.tradingview.handler-datasource/server-time]}
 
+ :autoload-cljs-dir ["ta/tradingview/goldly/page"]
+
 
 }
diff --git a/lib/trateg/deps.edn b/lib/trateg/deps.edn
@@ -1,4 +1,6 @@
-{:paths ["src"]
+{:paths ["src"
+         "resources" ; extension data
+         ]
  :deps
  {org.clojure/clojure    {:mvn/version "1.11.1"}
   org.clojure/core.async {:mvn/version "1.3.618"}

diff --git a/lib/trateg/resources/ext/trateg.edn b/lib/trateg/resources/ext/trateg.edn
@@ -0,0 +1,22 @@
+{; runtime
+ :clj-services {:name "trateg services"
+                :permission  #{}
+                :symbols [; warehouse
+                          ta.warehouse.symbollist/get-lists
+                          ta.warehouse.symbollist/load-list
+                          ta.warehouse.overview/overview-map
+                          ; data
+                          ta.data.load/load-series
+                          ; algo
+                          ta.algo.manager/algo-names
+                          ta.algo.manager/algo-info
+                          ta.algo.manager/tradingview-algo-chart-specs
+                          ta.algo.manager/algo-run-window-browser
+                          ta.algo.manager/algo-run-browser
+                          ta.algo.manager/algo-marks
+                          ta.algo.manager/algo-shapes
+                          ; testing
+                          ta.helper.date/now-datetime]}
+
+
+}
diff --git a/lib/trateg/src/ta/multi/nav_trades.clj b/lib/trateg/src/ta/multi/nav_trades.clj
@@ -277,13 +277,7 @@
   (portfolio (take 400 trades))
   (portfolio trades)
 
-
-       ;count
-  (portfolio-stats)
-  )
-
 
-    
-
+ ; 
+  )
 
-  )