WIP: Add notebooks data to client search

Author: jackrueth

_search/client/src/app.js

@@ -4,12 +4,12 @@ import TypesenseInstantSearchAdapter from "typesense-instantsearch-adapter";
 
 const typesenseInstantsearchAdapter = new TypesenseInstantSearchAdapter({
   server: {
-    apiKey: "hz046FoyrmnivD6aCNxGOQA5OZ8dNI70", // Be sure to use the search-only-api-key
+    apiKey:  "KfjkBJl6Yilg8sK0vngKBv6g7csQgVPH" , // Be sure to use the search-only-api-key
     nodes: [
       {
-        host: "search.imagej.net",
+        host: "144.92.48.217",
         port: "8108",
-        protocol: "https"
+        protocol: "http"
       }
     ]
   },

_search/server/index-sites.py

@@ -51,8 +51,9 @@ def main(args):
     if len(args) == 1:
         collection = 'imagej-wiki'
         sites = {
-            'imagej.net': os.path.join(os.path.dirname(args[0]), '..', '..'),
-            'imagej.nih.gov/ij': '/var/www/mirror.imagej.net',
+            # 'imagej.net': os.path.join(os.path.dirname(args[0]), '..', '..'),
+            # 'imagej.nih.gov/ij': '/var/www/mirror.imagej.net',
+            'imagej-tutorials' : "/Users/jackrueth/code/imagej/tutorials/"
         }
     elif len(args) >= 3:
         collection = args[1]

_search/server/tsutil.py

@@ -25,12 +25,12 @@ def connect():
 
     return typesense.Client({
       'nodes': [{
-        'host': 'search.imagej.net',
+        'host': '144.92.48.217',
         'port': '8108',
-        'protocol': 'https'
+        'protocol': 'http'
       }],
       'api_key': api_key,
-      'connection_timeout_seconds': 2,
+      'connection_timeout_seconds': 10,
     })
 
 

_search/server/tutorials.py

@@ -15,20 +15,25 @@
 
 
 def is_imagej_tutorials(root):
-    java = Path(root) / 'java'
+    # java = Path(root) / 'java'
     notebooks = Path(root) / 'notebooks'
-    return java.isdir() and notebooks.isdir()
+    return notebooks.is_dir()
+    # return java.is_dir() and notebooks.is_dir()
 
 
 def parse_java_source(path):
     logger.debug(f'Parsing Java source file {path}...')
 
     with open(path) as f:
-        lines = json.load(f)
+        lines = f.read()
 
     # This is dumb -- do we want to do better?
     doc = {}
     doc['content'] = ''.join(lines)
+    doc['title'] = str(path)
+    doc['icon'] = '/media/icons/imagej.png'
+    doc['score'] = 90
+    doc['description'] = ''
 
     return doc
 
@@ -41,6 +46,10 @@ def parse_notebook(path):
 
     doc = {}
     doc['content'] = ''
+    doc['title'] = str(path)
+    doc['icon'] = '/media/icons/imagej.png'
+    doc['score'] = 90
+    doc['description'] = ''
     for cell in data['cells']:
         # TODO: implement process_cell: extract source and output(s) if present
         doc['content'] += process_cell(cell)
@@ -88,6 +97,8 @@ def load_imagej_tutorials(root):
         try:
             doc = parse_java_source(javafile)
             if doc:
+                nbpath = str(javafile)[len(str(root)) + 1:]
+                doc['id'] = f'https://github.com/imagej/tutorials/blob/master/{nbpath}' 
                 documents.append(doc)
         except:
             logger.error(f'Failed to parse {Path}:')
@@ -108,11 +119,11 @@ def load_imagej_tutorials(root):
 
     return documents
 
-def main(args):
+""" def main(args):
     docs = load_imagej_tutorials(args[0])
     for doc in docs: 
         # pprint(doc)
         print(doc['id'])
 
 if __name__ == '__main__':
-    main(['/Users/jackrueth/code/imagej/tutorials'])
+    main(['/Users/jackrueth/code/imagej/tutorials']) """