Completions bug fix (#129)

* Completions bug fix

* syntax error

.github/workflows/build_and_test.yml

@@ -8,6 +8,12 @@ jobs:
     steps:
       - name: Checkout Code
         uses: actions/checkout@v3
+      - name: Setup Node
+        uses: actions/setup-node@v3
+        with:
+          node-version: '18'
+          cache: "yarn"
+          cache-dependency-path: "zt_frontend/yarn.lock"
       - name: Setup Python for Docs
         uses: actions/setup-python@v4
         with:
@@ -45,10 +51,10 @@ jobs:
           rm -r zt_backend/dist_dev/
           rm -r zt_backend/dist_app/
           cd zt_frontend
-          yarn install 
+          yarn install
           yarn run build
           cp -r dist/ ../zt_backend/dist_dev/
-          yarn run buildapp 
+          yarn run buildapp
           cp -r dist/ ../zt_backend/dist_app/
       - name: Upload Frontend Artifacts
         if: steps.check-changes.outputs.any_changed == 'true'
@@ -81,7 +87,7 @@ jobs:
           Remove-Item -Path zt_backend\dist_dev -Force -Recurse
           Remove-Item -Path zt_backend\dist_app -Force -Recurse
         shell: powershell
-        # Only run this step on Windows
+
 
       - name: Remove Existing Frontend Files (Linux/Mac)
         if: runner.os != 'Windows' && needs.build-frontend.outputs.any_changed == 'true'
@@ -100,4 +106,4 @@ jobs:
       - name: Setup Chrome
         uses: nanasess/setup-chromedriver@v2
       - name: Test with pytest
-        run: pytest
+        run: pytest

.github/workflows/docker_build.yml

@@ -12,10 +12,27 @@ jobs:
     steps:
     - name: Check out code
       uses: actions/checkout@v3
+    - name: Setup Node
+      uses: actions/setup-node@v3
+      with:
+        node-version: '18'
+        cache: "yarn"
+        cache-dependency-path: "zt_frontend/yarn.lock"
     - name: Set output
       id: release_tag
       run: echo "tag=${GITHUB_REF#refs/*/}" >> $GITHUB_OUTPUT
-
+    - name: Build Frontend Files
+      run: |
+        npm install --global yarn
+        ls -a
+        rm -r zt_backend/dist_dev/
+        rm -r zt_backend/dist_app/
+        cd zt_frontend
+        yarn install
+        yarn run build
+        cp -r dist/ ../zt_backend/dist_dev/
+        yarn run buildapp
+        cp -r dist/ ../zt_backend/dist_app/
     - name: configure aws credentials
       uses: aws-actions/configure-aws-credentials@v4
       with:
@@ -32,4 +49,4 @@ jobs:
         IMAGE_TAG: "${{ steps.release_tag.outputs.tag }}"
       run: |
         docker build -t $ECR_REGISTRY/$ECR_REPOSITORY:zero-true-$IMAGE_TAG .
-        docker push $ECR_REGISTRY/$ECR_REPOSITORY:zero-true-$IMAGE_TAG
+        docker push $ECR_REGISTRY/$ECR_REPOSITORY:zero-true-$IMAGE_TAG

setup.cfg

@@ -3,7 +3,7 @@ name = zero-true
 description = A collaborative notebook built for data scientists
 long_description = file: README.md
 long_description_content_type = text/markdown
-version = 0.0.dev35
+version = 0.0.dev36
 
 [options]
 include_package_data = true

zt_backend/dist_app/index.html

@@ -5,7 +5,7 @@
     <link rel="icon" href="./favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Zero-True</title>
-    <script type="module" crossorigin src="./assets/index-11b2a933.js"></script>
+    <script type="module" crossorigin src="./assets/index-210ed3b1.js"></script>
     <link rel="stylesheet" href="./assets/index-b4b3b1e9.css">
   </head>
 

zt_backend/dist_dev/index.html

@@ -5,7 +5,7 @@
     <link rel="icon" href="./favicon.ico" />
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>Zero-True</title>
-    <script type="module" crossorigin src="./assets/index-ef62f442.js"></script>
+    <script type="module" crossorigin src="./assets/index-a82a07b4.js"></script>
     <link rel="stylesheet" href="./assets/index-b4b3b1e9.css">
   </head>
 

zt_backend/models/generate_schema.py

@@ -2,7 +2,6 @@
 from .response import Response
 from .notebook import Notebook
 from .notebook import NotebookResponse
-from .notebook import Completions
 from .components.slider import Slider
 from .components.text_input import TextInput
 from .components.text_area_input import TextArea
@@ -33,7 +32,6 @@ def generate_schema():
     generate_json(Response, 'response')
     generate_json(Slider, 'slider')
     generate_json(Notebook, 'notebook')
-    generate_json(Completions, 'completions')
     generate_json(NotebookResponse, 'notebook_response')
     generate_json(TextInput, 'text_input')
     generate_json(TextArea,'text_area')

zt_backend/models/notebook.py

@@ -64,13 +64,6 @@ class Notebook(BaseModel):
 class Dependencies(BaseModel):
     value: str
 
-class Completion(BaseModel):
-    completions: list
-
-class Completions(BaseModel):
-    cell_id: str
-    cell_completions: Completion
-
 class NotebookResponse(BaseModel):
     notebook: Notebook
     dependencies: Dependencies

zt_backend/router.py

@@ -327,6 +327,8 @@ async def stop_execution(websocket: WebSocket):
 
 @router.on_event('shutdown')
 def shutdown():
+    global current_thread
+    global user_threads
     if current_thread:
         current_thread.kill()
     for user_id in user_threads:

zt_backend/utils.py

@@ -155,9 +155,13 @@ def save_toml():
     logger.debug("Toml saved for notebook %s", zt_notebook.notebookId)
 
 def get_code_completions(cell_id:str, code: str, line: int, column: int) -> list:
-    script = jedi.Script(code)
-    completions = script.complete(line, column)
-    return {"cell_id": cell_id, "completions": [{"label": completion.name, "type": completion.type} for completion in completions]}
+    try:
+        script = jedi.Script(code)
+        completions = script.complete(line, column)
+        return {"cell_id": cell_id, "completions": [{"label": completion.name, "type": completion.type} for completion in completions]}
+    except Exception:
+        logger.debug("Error getting completions for cell_id %s: %s", cell_id, traceback.format_exc())
+        return {"cell_id": cell_id, "completions": []}
 
 async def websocket_message_sender(execution_state: UserState):
     while True:

zt_frontend/src/App.vue

@@ -85,7 +85,6 @@ import { SaveRequest } from "./types/save_request";
 import { CreateRequest, Celltype } from "./types/create_request";
 import { ClearRequest } from "./types/clear_request";
 import { Notebook, CodeCell, Layout } from "./types/notebook";
-import { Completions, Completion } from "./types/completions";
 import { Dependencies } from "./types/notebook_response";
 import CodeComponent from "@/components/CodeComponent.vue";
 import MarkdownComponent from "@/components/MarkdownComponent.vue";
@@ -106,7 +105,7 @@ export default {
     return {
       notebook: {} as Notebook,
       dependencies: {} as Dependencies,
-      completions: {} as Completions,
+      completions: {} as {[key: string]: any[]},
       ws_url: '',
       notebook_socket: null as WebSocket | null,
       save_socket: null as WebSocket | null,
@@ -124,9 +123,9 @@ export default {
           { title: 'Text' },
         ],
       concatenatedCodeCache: {
-      lastCellId: null as string | null,
+      lastCellId: '' as string,
       code: '' as string,
-      length: null as number | null
+      length: 0 as number
     }
     };
   },
@@ -238,10 +237,7 @@ export default {
             this.notebook = cell_response.notebook;
             for (let cell_id in this.notebook.cells){
               if (this.notebook.cells[cell_id].cellType==='code'){
-                const completion: Completion = {
-                  completions: []
-                }
-                this.completions[cell_id] = completion
+                this.completions[cell_id] = []
               }
             }
             this.dependencies = cell_response.dependencies;
@@ -468,8 +464,6 @@ export default {
     },
 
     async saveCell(cellId: string, text: string, line: string, column: string) {
-      let concatenatedCode = '';
-
       // Check if the current cell is a code cell
       if (this.notebook.cells[cellId].cellType === 'code') {
         if (this.concatenatedCodeCache.lastCellId !== cellId) {

zt_frontend/src/components/CodeComponent.vue

@@ -175,7 +175,6 @@ import {
 } from "vuetify/lib/components/index.mjs";
 import { VDataTable } from "vuetify/labs/VDataTable";
 import { CodeCell, Layout } from "@/types/notebook";
-import { Completion } from "@/types/completions";
 import LayoutComponent from "@/components/LayoutComponent.vue";
 import TextComponent from "@/components/TextComponent.vue"
 
@@ -204,7 +203,7 @@ export default {
       required: true,
     },
     completions: {
-      type: Object as PropType<Completion>,
+      type: Object as PropType<any[]>,
       required: true
     }
   },
@@ -247,19 +246,19 @@ export default {
         const from = word ? word.from : context.pos;
 
         return {
-              from: from,
-              options: (this.completions as unknown as { label: string; type: string }[]).map(completion => ({
-                label: completion.label,
-                type: completion.type,
-                apply: (view: { dispatch: (arg0: { changes: { from: any; to: any; insert: any } }) => void }, completion: { label: any }, from: any, to: any) => {
-                  const insertText = completion.label;
-                  view.dispatch({
-                    changes: { from: from, to: to ?? context.pos, insert: insertText }
-                  });
-                }
-              }))
-            };
-          };
+          from: from,
+          options: (this.completions as unknown as { label: string; type: string }[]).map(completion => ({
+            label: completion.label,
+            type: completion.type,
+            apply: (view: { dispatch: (arg0: { changes: { from: any; to: any; insert: any } }) => void }, completion: { label: any }, from: any, to: any) => {
+              const insertText = completion.label;
+              view.dispatch({
+                changes: { from: from, to: to ?? context.pos, insert: insertText }
+              });
+            }
+          }))
+        };
+      };
       if (this.$devMode){
         return [Prec.highest(keyMap), python(), oneDark, autocompletion({ override: [customCompletionSource] })]
       }