Merge pull request #1460 from VirtualFlyBrain/alpha

swapping to cached version
VirtualFlyBrain · Feb 2, 2024 · be73ea2 · be73ea2
2 parents 231349b + b54abe1
commit be73ea2
Show file tree

Hide file tree

Showing 13 changed files with 20,487 additions and 55 deletions.
diff --git a/.vscode/settings.json b/.vscode/settings.json
@@ -0,0 +1 @@
+{}
diff --git a/Dockerfile b/Dockerfile
@@ -12,12 +12,12 @@ VOLUME /tmp/error
 ARG geppettoRelease=vfb_20200604_a
 ARG geppettoModelRelease=vfb_20200604_a
 ARG geppettoCoreRelease=VFBv2.2.0
-ARG geppettoSimulationRelease=vfb_20200604_a
-ARG geppettoDatasourceRelease=vfb_20200604_a
+ARG geppettoSimulationRelease=VFBv2.1.0.2
+ARG geppettoDatasourceRelease=passingSOLR
 ARG geppettoModelSwcRelease=v1.0.1
 ARG geppettoFrontendRelease=VFBv2.1.0.3
 ARG geppettoClientRelease=VFBv2.2.3
-ARG ukAcVfbGeppettoRelease=download
+ARG ukAcVfbGeppettoRelease=fullcache
 
 ARG mvnOpt="-Dhttps.protocols=TLSv1.2 -DskipTests --quiet -Pmaster"
 

diff --git a/components/VFBMain.js b/components/VFBMain.js
@@ -195,7 +195,7 @@ class VFBMain extends React.Component {
     GEPPETTO.SceneController.deselectAll(); // signal something is happening!
     var variables = GEPPETTO.ModelFactory.getTopLevelVariablesById(variableId);
     if (!variables.length > 0) {
-      Model.getDatasources()[0].fetchVariable(variableId, function () {
+      Model.getDatasources()[4].fetchVariable(variableId, function () {
         if (callback != undefined) {
           callback(variableId, label);
         }

diff --git a/components/configuration/VFBListViewer/controlsMenuConfiguration.js b/components/configuration/VFBListViewer/controlsMenuConfiguration.js
@@ -112,12 +112,12 @@ const controlsMenuConf = {
             options : {
               false : {
                 label: "Show",
-                icon: "fa fa-eye",
+                icon: "fa fa-eye-slash",
                 action: { handlerAction: ACTIONS.SHOW, }
               },
               true : {
                 label: "Hide",
-                icon: "fa fa-eye-slash",
+                icon: "fa fa-eye",
                 action: { handlerAction: ACTIONS.HIDE, }
               }
             }
@@ -211,4 +211,4 @@ const controlsMenuConf = {
   ]
 };
 
-export default controlsMenuConf;
+export default controlsMenuConf;
diff --git a/components/configuration/VFBMain/searchConfiguration.js b/components/configuration/VFBMain/searchConfiguration.js
@@ -149,6 +149,11 @@ var searchConfiguration = {
           "filter_name": "Neuron",
           "enabled": "disabled",
         },
+        {
+          "key": "Class",
+          "filter_name": "Type",
+          "enabled": "disabled",
+        },
         {
           "key": "has_image",
           "filter_name": "Image",

diff --git a/components/configuration/VFBToolbar/vfbtoolbarMenuConfiguration.js b/components/configuration/VFBToolbar/vfbtoolbarMenuConfiguration.js
@@ -270,11 +270,10 @@ var toolbarMenu = {
             },
             {
               label: "NBLAST against your own data",
-              icon: "",
-              trailerIcon: "fa fa-external-link",
+              icon: "fa fa-upload",
               action: {
-                handlerAction: "openNewTab",
-                parameters: ["http://nblast.virtualflybrain.org:8080/NBLAST_on-the-fly/?gal4_n=10&all_use_mean=F&all_query=&tab=One%20against%20all&gal4_query="]
+                handlerAction: "uploaderContentsVisible",
+                parameters: []
               }
             }
           ]

diff --git a/components/configuration/VFBUploader/configuration.json b/components/configuration/VFBUploader/configuration.json
@@ -1,10 +1,10 @@
 {
-	"nblastURL" : "http://upload.virtualflybrain.org/files/UNIQUE_ID?token=bec3a40f0ab377c39103",
+	"nblastURL" : "https://upload.virtualflybrain.org/files/UNIQUE_ID?token=bec3a40f0ab377c39103",
 	"contentType" : "multipart/form-data",
 	"templates" : [{"short_form":"VFB_00101567","label":"JRC2018Unisex"},{"short_form":"VFB_00200000","label":"JRC2018UnisexVNC"}] ,
 	"acceptedFiles" : [".swc", ".nrrd"],
 	"filesLimit" : 1,
-	"maxFileSize" : 3000000,
+	"maxFileSize" : 5242880,
 	"queryType": "uploaderQuery",
 	"cookieStorageDays" : 100,
 	"cookiesLearnLink" : "https://en.wikipedia.org/wiki/HTTP_cookie",

diff --git a/components/interface/VFBFocusTerm/VFBFocusTerm.js b/components/interface/VFBFocusTerm/VFBFocusTerm.js
@@ -363,6 +363,8 @@ class VFBFocusTerm extends React.Component {
                                                                               { variable: variable2, allQueries: allQueries2 }];
             }
           });
+        } else {
+          this.configuration.buttons[0].dynamicListInjector.parameters = [{ variable: variable, allQueries: allQueries }];
         }
       } else {
         this.configuration.buttons[0].dynamicListInjector.parameters = [{ variable: variable, allQueries: allQueries }];
@@ -568,6 +570,13 @@ class VFBFocusTerm extends React.Component {
                   </Tooltip>
                   : <i className="fa fa-chevron-right arrowsStyle isDisabled" /> 
                 }
+                <Tooltip placement="top-end"
+                  title="NBLAS Uploader">
+                  <i id="fa-upload" className="fa fa-upload arrowsStyle"
+                    onClick={() => {
+                      this.props.UIUpdateManager("uploaderContentsVisible");
+                    }} />
+                </Tooltip>
                 <Tooltip placement="top-end"
                   title="Download Contents">
                   <i className="fa fa-download arrowsStyle"

diff --git a/components/interface/VFBTermInfo/VFBTermInfo.js b/components/interface/VFBTermInfo/VFBTermInfo.js
@@ -829,7 +829,7 @@ class VFBTermInfoWidget extends React.Component {
             }, 100);
           }
         } else {
-          Model.getDatasources()[0].fetchVariable(path, function () {
+          Model.getDatasources()[4].fetchVariable(path, function () {
             var m = Instances.getInstance(meta);
             this.setTermInfo(m, m.name);
             window.addVfbId(path);

diff --git a/css/VFBTermInfo.less b/css/VFBTermInfo.less
@@ -848,6 +848,7 @@
 	color: white;
 	clear: both;
 	max-width: 100%;
+    max-height: 260px;
     margin-left: 25px;
 }
 

diff --git a/model/vfb-dev.xmi b/model/vfb-dev.xmi
@@ -879,6 +879,54 @@
         description="Keep nothing slimply pass ids and scores"
         queryProcessorId="nblastQueryProcessor"/>
   </dataSources>
+  <dataSources
+      id="querycache"
+      name="SOLR Cached Queries"
+      dataSourceService="solrqueryDataSource"
+      url="https://solr.VirtualFlyBrain.org/solr/vfb_json/select"
+      dependenciesLibrary="//@libraries.3"
+      targetLibrary="//@libraries.4">
+    <libraryConfigurations
+        library="//@libraries.0"
+        modelInterpreterId="swcModelInterpreterService"
+        format="swc"/>
+    <libraryConfigurations
+        library="//@libraries.1"
+        modelInterpreterId="objModelInterpreterService"
+        format="obj"/>
+    <libraryConfigurations
+        library="//@libraries.2"
+        modelInterpreterId="owlModelInterpreterService"
+        format="owl"/>
+    <queries
+        xsi:type="gep_2:SimpleQuery"
+        id="cachedvfbjsoncall"
+        name="Get cached VFB_JSON for Term"
+        description="Get cached VFB_JSON for Term"
+        query="&quot;params&quot;:{&quot;defType&quot;:&quot;edismax&quot;,&quot;fl&quot;:&quot;term_info&quot;,&quot;indent&quot;:&quot;true&quot;,&quot;q.op&quot;:&quot;OR&quot;,&quot;q&quot;:&quot;$ID&quot;,&quot;qf&quot;:&quot;id&quot;,&quot;rows&quot;:&quot;1&quot;}"
+        countQuery="&quot;params&quot;:{&quot;defType&quot;:&quot;edismax&quot;,&quot;fl&quot;:&quot;term_info&quot;,&quot;indent&quot;:&quot;true&quot;,&quot;q.op&quot;:&quot;OR&quot;,&quot;q&quot;:&quot;$ID&quot;,&quot;qf&quot;:&quot;id&quot;,&quot;rows&quot;:&quot;1&quot;}"/>
+    <fetchVariableQuery
+        xsi:type="gep_2:CompoundQuery"
+        name="Process Cached JSON"
+        description="">
+      <queryChain
+          xsi:type="gep_2:SimpleQuery"
+          name="Get term info"
+          description="Fetches essential details."
+          query="&quot;params&quot;:{&quot;defType&quot;:&quot;edismax&quot;,&quot;fl&quot;:&quot;term_info&quot;,&quot;indent&quot;:&quot;true&quot;,&quot;q.op&quot;:&quot;OR&quot;,&quot;q&quot;:&quot;id:$ID&quot;,&quot;qf&quot;:&quot;id&quot;,&quot;rows&quot;:&quot;1&quot;}"
+          countQuery="&quot;params&quot;:{&quot;defType&quot;:&quot;edismax&quot;,&quot;fl&quot;:&quot;term_info&quot;,&quot;indent&quot;:&quot;true&quot;,&quot;q.op&quot;:&quot;OR&quot;,&quot;q&quot;:&quot;id:$ID&quot;,&quot;qf&quot;:&quot;id&quot;,&quot;rows&quot;:&quot;1&quot;}"/>
+      <queryChain
+          xsi:type="gep_2:ProcessQuery"
+          name="Process Term Core"
+          description="Process Term Core"
+          queryProcessorId="vfbProcessTermInfoCachedCore"/>
+      <queryChain
+          xsi:type="gep_2:ProcessQuery"
+          name="Process Cached JSON"
+          description="Process Cached JSON"
+          queryProcessorId="vfbProcessTermInfoCachedJson"/>
+    </fetchVariableQuery>
+  </dataSources>
   <queries xsi:type="gep_2:CompoundRefQuery"
       id="ListAllAvailableImages"
       name="List all available images for class with examples"