Flask reimplementation

.devcontainer/Dockerfile

@@ -10,41 +10,22 @@ ENV   PYTHONFAULTHANDLER=1 \
   PIP_NO_CACHE_DIR=off \
   PIP_DISABLE_PIP_VERSION_CHECK=on \
   PIP_DEFAULT_TIMEOUT=100 \
-  POETRY_VERSION=1.0.0
+  POETRY_VERSION=1.1.14
 
 
 # [Optional] Uncomment this section to install additional OS packages.
 RUN apt-get update && export DEBIAN_FRONTEND=noninteractive \
     && apt-get -y install --no-install-recommends curl build-essential \
-     software-properties-common python3-pip make build-essential \
-     python-dev libssl-dev zlib1g-dev libbz2-dev libreadline-dev \
-     libsqlite3-dev curl libffi-dev redis-server openjdk-8-jre-headless \
-     graphviz libgraphviz-dev libcairo2-dev pkg-config python3-dev python3.8-venv \
-     python3-setuptools
+      software-properties-common python3-pip make build-essential \
+      python-dev libssl-dev zlib1g-dev libbz2-dev libreadline-dev \
+      libsqlite3-dev curl libffi-dev redis-server openjdk-8-jre-headless \
+      graphviz libgraphviz-dev libcairo2-dev pkg-config python3-dev python3.8-venv \
+      python3-setuptools liblzma-dev \
+      python3-pygraphviz apt-utils
 
 
-RUN pip install "poetry==$POETRY_VERSION"
-
-# # Pyenv for our baseline python environment for poetry later on.
-RUN git clone git://github.com/yyuu/pyenv.git .pyenv
-RUN git clone https://github.com/yyuu/pyenv-virtualenv.git ~/.pyenv/plugins/pyenv-virtualenv
-
-ENV PYENV_ROOT $HOME/.pyenv
-ENV PATH $PYENV_ROOT/shims:$PYENV_ROOT/bin:$PATH
-
-RUN pyenv install 3.8.0
-RUN pyenv global 3.8.0
-
-RUN poetry config virtualenvs.create false
 RUN pip install --upgrade pip
 RUN pip install setuptools pygraphviz
 
 
-# Installing Nodejs
-RUN curl -sL --location https://deb.nodesource.com/setup_16.x | bash -
-RUN apt-get -y install nodejs
-
-#Remove this later on
-RUN apt-get -y install redis-server
-
 

.devcontainer/devcontainer.json

@@ -1,26 +1,61 @@
 // For format details, see https://aka.ms/devcontainer.json. For config options, see the README at:
-// https://github.com/microsoft/vscode-dev-containers/tree/v0.194.3/containers/ubuntu
+// https://github.com/microsoft/vscode-dev-containers/tree/v0.245.2/containers/docker-existing-docker-compose
+// If you want to run as a non-root user in the container, see .devcontainer/docker-compose.yml.
 {
-	"name": "Ubuntu",
-	"build": {
-		"dockerfile": "Dockerfile",
-		// Update 'VARIANT' to pick an Ubuntu version: hirsute, focal, bionic
-		"args": { "VARIANT": "focal" }
-	},
+	"name": "Neptune Dev - Existing Docker Compose (Extend)",
 
-	// Set *default* container specific settings.json values on container create.
-	"settings": {},
+	// Update the 'dockerComposeFile' list if you have more compose files or use different names.
+	// The .devcontainer/docker-compose.yml file contains any overrides you need/want to make.
+	"dockerComposeFile": [
+		"../docker-compose.yml",
+		"docker-compose.extend.yml"
+	],
 
+	// The 'service' property is the name of the service for the container that VS Code should
+	// use. Update this value and .devcontainer/docker-compose.yml to the real service name.
+	"service": "dev",
 
-	// Add the IDs of extensions you want installed when the container is created.
-	"extensions": [],
+	// The optional 'workspaceFolder' property is the path VS Code should open by default when
+	// connected. This is typically a file mount in .devcontainer/docker-compose.yml
+	"workspaceFolder": "/workspace",
 
 	// Use 'forwardPorts' to make a list of ports inside the container available locally.
 	// "forwardPorts": [],
 
-	// Use 'postCreateCommand' to run commands after the container is created.
-	// "postCreateCommand": "uname -a",
+	// Uncomment the next line if you want start specific services in your Docker Compose config.
+	"runServices": ["s3local", "broker", "backend-database"],
+
+	// Uncomment the next line if you want to keep your containers running after VS Code shuts down.
+	"shutdownAction": "stopCompose",
 
-	// Comment out connect as root instead. More info: https://aka.ms/vscode-remote/containers/non-root.
-	//"remoteUser": "vscode"
-}
+	// Uncomment the next line to run commands after the container is created - for example installing curl.
+	// "postCreateCommand": "cd flask-reimplementation && poetry install --no-interaction --no-ansi && cd ../job-runner && pip install .",
+
+	// Uncomment to connect as a non-root user if you've added one. See https://aka.ms/vscode-remote/containers/non-root.
+	// "remoteUser": "vscode"
+	"customizations":{"vscode": {
+			"extensions": [
+				"GitHub.copilot",
+				"LeoJhonSong.python-extension-pack",
+				"littlefoxteam.vscode-python-test-adapter",
+				"njqdev.vscode-python-typehint",
+				"redhat.vscode-yaml",
+				"streetsidesoftware.code-spell-checker",
+				"yzhang.markdown-all-in-one",
+				"VisualStudioExptTeam.vscodeintellicode",
+				"GitHub.vscode-pull-request-github",
+				"bungcip.better-toml",
+				"njpwerner.autodocstring",
+				"ms-python.python",
+				"VisualStudioExptTeam.vscodeintellicode"
+			]
+		}
+	},
+	// Features to add to the dev container. More info: https://containers.dev/features.
+	"features": {
+		"ghcr.io/devcontainers/features/git-lfs:1": {},
+		"ghcr.io/devcontainers/features/node:1": {},
+		"ghcr.io/devcontainers/features/python:1": {},
+		"ghcr.io/devcontainers-contrib/features/poetry:2": {}
+	}
+}

.env

@@ -1,12 +1,13 @@
 # celery details
 CELERY_BROKER_URL="redis://broker:6379/0"
+CELERY_TASK_META_COLLECTION_NAME="celery_task_meta"
 
 # mongodb details
 MONGO_HOST="backend-database"
 MONGO_PORT="27017"
 MONGO_INITDB_ROOT_USERNAME="root"
 MONGO_INITDB_ROOT_PASSWORD="rootpassword"
-MONGO_INITDB_NAME="jobs"
+MONGO_INITDB_NAME="neptune"
 
 # Neptune details
 NEPTUNE_MONGODB_DBNAME="neptune"

Neptune-UI/package.json

@@ -18,11 +18,12 @@
     "@sentry/vue": "^6.1.0",
     "axios": "^0.19.2",
     "core-js": "^3.6.2",
+    "socket.io-client": "^4.5.3",
     "vue": "^2.6.11",
     "vue-i18n": "^8.15.3",
     "vue-monaco": "^1.1.0",
     "vue-router": "^3.1.3",
-    "vue-socket.io": "^3.0.7",
+    "vue-socket.io-extended": "^4.2.0",
     "vue-terminal-ui": "^0.1.6",
     "vuetify": "^2.2.6",
     "vuex": "^3.1.2",

Neptune-UI/src/main.js

@@ -21,11 +21,16 @@ import "./plugins/vee-validate";
 import "./plugins/vue-world-map";
 import vuetify from "./plugins/vuetify";
 import i18n from "./i18n";
-import VueSocketIO from "vue-socket.io";
+
 
 import * as Sentry from "@sentry/vue";
 import { Integrations } from "@sentry/tracing";
 
+import VueSocketIOExt from 'vue-socket.io-extended';
+import { io } from 'socket.io-client';
+
+
+
 Sentry.init({
   Vue,
   dsn:
@@ -39,18 +44,23 @@ Sentry.init({
 
 Vue.config.productionTip = false;
 
-Vue.use(
-  new VueSocketIO({
-    debug: true,
-    connection: "http://" + window.location.hostname + ":3000"
-    // vuex: {
-    //     store,
-    //     actionPrefix: 'SOCKET_',
-    //     mutationPrefix: 'SOCKET_'
-    // },
-    // options: { path: "/my-app/" } //Optional options
-  })
-);
+const socket = io('http://127.0.0.1:8080');
+
+Vue.use(VueSocketIOExt, socket);
+
+
+// Vue.use(
+//   new VueSocketIO({
+//     debug: true,
+//     connection: "localhost:8080" //"http://" + window.location.hostname
+//     // vuex: {
+//     //     store,
+//     //     actionPrefix: 'SOCKET_',
+//     //     mutationPrefix: 'SOCKET_'
+//     // },
+//     // options: { path: "/my-app/" } //Optional options
+//   })
+// );
 
 router.beforeEach((to, from, next) => {
   const authRequired = to.matched.some(route => route.meta.requiresAuth);

Neptune-UI/src/services/auth_header.js

@@ -0,0 +1,8 @@
+export default function authHeader() {
+  const user = JSON.parse(localStorage.getItem('user'));
+  if (user && user.accessToken) {
+    return { Authorization: 'Bearer ' + user.accessToken };
+  } else {
+    return {};
+  }
+}

Neptune-UI/src/services/auth_service.js

@@ -0,0 +1,33 @@
+import axios from axios;
+
+
+class AuthService {
+    login(user) {
+        return axios
+            .post(API_URL + 'signin', {
+                username: user.username,
+                password: user.password
+            })
+            .then(response => {
+                if (response.data.accessToken) {
+                    localStorage.setItem('user', JSON.stringify(response.data));
+                }
+
+                return response.data;
+            });
+    }
+
+    logout() {
+        localStorage.removeItem('user');
+    }
+
+    register(user) {
+        return axios.post(API_URL + 'signup', {
+            username: user.username,
+            email: user.email,
+            password: user.password
+        });
+    }
+}
+
+export default new AuthService();

Neptune-UI/src/services/file_service.js

@@ -0,0 +1,5 @@
+class FileService {
+
+}
+
+export default new FileService();

Neptune-UI/src/services/job_service.js

@@ -0,0 +1,5 @@
+class JobService {
+
+}
+
+export default new JobService();

Neptune-UI/src/services/user_service.js

@@ -0,0 +1,9 @@
+const API_URL = '/api/v2/user'
+
+class UserService {
+    getUserData() {
+        return axios.get(API_URL, { headers: authHeader(),  });
+    }
+}
+
+export default new UserService();

Neptune-UI/src/services/workspace_service.js

@@ -0,0 +1,5 @@
+class WorkSpaceService {
+
+}
+
+export default new WorkSpaceService();

Neptune-UI/src/store.js

@@ -13,6 +13,7 @@ export default new Vuex.Store({
     currentFile: null,
     currentWorkspace: null,
     currentUser: null,
+    authToken:''
   },
   mutations: {
     SET_BAR_IMAGE (state, payload) {
@@ -39,6 +40,9 @@ export default new Vuex.Store({
     },
     SET_CURRENT_USER(state, payload){
       state.currentUser = payload
+    },
+    SET_AUTH_TOKEN(state, payload){
+      state.authToken = payload
     }
   },
   getters: {
@@ -47,6 +51,7 @@ export default new Vuex.Store({
     currentFile: state => state.currentFile,
     currentWorkspace: state => state.currentWorkspace,
     currentUser: state => state.currentUser,
+    authToken: state => state.authToken
   },
   actions: {
 

Neptune-UI/src/utils.js

@@ -1,4 +1,13 @@
 export function getprettytimestamp (datestring = Date.now().toString()){
     let dateobject = new Date(datestring)
     return dateobject.toLocaleDateString()+ " " +  dateobject.toLocaleTimeString()
-}
+}
+
+export default function authHeader() {
+    const user = JSON.parse(localStorage.getItem('user'));
+    if (user && user.accessToken) {
+      return { Authorization: 'Bearer ' + user.accessToken };
+    } else {
+      return {};
+    }
+  }

Neptune-UI/src/views/pages/Landing.vue

@@ -9,7 +9,6 @@
         <v-img
           :src="require(`@/assets/Neptune-logo-white-text.png`)"
           height="300px"
-          contain="true"
           />
       </v-slide-y-transition>
     </v-row>
@@ -39,6 +38,19 @@
         },
       ],
     }),
+    mounted () {
+      console.log('Landing.vue mounted hook')
+      this.$socket.client.emit('echo', 'Hello World!')
+    },
+    sockets: {
+      connect () {
+        console.log('socket connected')
+      },
+      echo (val) {
+        console.log('this method was fired by the socket server. eg: io.emit("customEmit", data)')
+        console.log(val)
+      },
+    },
     methods:{
       login: function(event){
         console.log("TEST")