Update docker-compose.yaml to mount init.sql file for PostgreSQL cont…

docker-compose.yaml

@@ -185,7 +185,8 @@ services:
     ports:
       - "5432:5432"
     volumes:
-      - ./data/postgres:/var/lib/postgresql/data
+      # - ./data/postgres:/var/lib/postgresql/data
+      - ./docker/postgres/init.sql:/docker-entrypoint-initdb.d/init.sql
     pull_policy: always
     deploy:
       resources:

docker/postgres/init.sql

@@ -0,0 +1,14 @@
+CREATE USER server WITH PASSWORD 'password-server';
+
+CREATE DATABASE server_db;
+
+\c server_db
+
+CREATE TABLE notebooks (
+    id SERIAL PRIMARY KEY,
+    name VARCHAR(100) NOT NULL,
+    path VARCHAR(100) NOT NULL
+);
+
+GRANT ALL PRIVILEGES ON TABLE notebooks TO server;
+GRANT ALL PRIVILEGES ON SEQUENCE notebooks_id_seq TO server;

requirements.txt

@@ -1,3 +1,5 @@
 Flask==3.0.3
 Flask-Cors==4.0.1
-requests==2.32.2
+requests==2.32.2
+Flask-SQLAlchemy==3.1.1
+psycopg2-binary==2.9.9

server/app/models/notebook.py

@@ -0,0 +1,24 @@
+from flask import jsonify
+from database import db
+
+class NotebookModel(db.Model):
+
+  __tablename__ = 'notebooks'
+
+  id = db.Column(db.Integer, primary_key=True, autoincrement=True)
+  name = db.Column(db.String, nullable=False)
+  path = db.Column(db.String, nullable=False)
+
+  def __init__(self, name, path):
+      self.name = name
+      self.path = path
+
+  def to_dict(self):
+      return {
+          'id': self.id,
+          'name': self.name,
+          'path': self.path
+      }
+
+
+

server/routes/notebook.py → server/app/routes/notebook.py

@@ -1,5 +1,5 @@
 from flask import Blueprint, jsonify, request
-from models.notebook import Notebook
+from app.services.notebook import Notebook
 
 notebook_blueprint = Blueprint('notebook', __name__)
 
@@ -11,6 +11,10 @@ def notebook():
         }
     )
 
+@notebook_blueprint.route('/notebook/all', methods=['GET'])
+def get_all_notebooks():
+    return Notebook.get_all_notebooks()
+
 @notebook_blueprint.route('/notebook/create', methods=['POST'])
 def create_notebook():
     data = request.get_json()

server/models/notebook.py → server/app/services/notebook.py

@@ -1,13 +1,23 @@
-from flask import jsonify
+from app.models.notebook import NotebookModel
 from datetime import datetime
 import requests
-import uuid
+from database import db
+import json
 import os
 
-class Notebook(object):
+class Notebook:
 
-  def __init__(self) -> None:
-    self.jupyter_server_path = os.environ.get("JUPYTER_SERVER_PATH", "http://localhost:8888")
+  @staticmethod
+  def get_all_notebooks():
+    notebooks = NotebookModel.query.all()
+
+    # Convert the notebooks to dictionaries
+    notebooks_dict = [notebook.to_dict() for notebook in notebooks]
+
+    # Now you can serialize notebooks_dict
+    notebooks_json = json.dumps(notebooks_dict)
+
+    return notebooks_json
 
   @staticmethod
   def create_notebook(notebook_name: str = None) -> None:
@@ -75,8 +85,7 @@ def create_notebook_with_init_cells(notebook_name: str = None) -> None:
             },
             "language_info": {
                 "name": 'python'
-            },
-            "uuid": str(uuid.uuid4())
+            }
         },
         "nbformat": 4,
         "nbformat_minor": 4
@@ -88,5 +97,14 @@ def create_notebook_with_init_cells(notebook_name: str = None) -> None:
       json=data
     )
 
+    notebook = NotebookModel(
+      name=notebook_name,
+      path=f'work/{notebook_name}'
+    )
+
+    db.session.add(notebook)
+    db.session.commit()
+
     return response.json()
 
+

server/database.py

@@ -0,0 +1,3 @@
+from flask_sqlalchemy import SQLAlchemy
+
+db = SQLAlchemy()

server/run.py

@@ -1,14 +1,24 @@
 from flask import Flask
 from flask_cors import CORS
-from routes.notebook import notebook_blueprint
+from database import db
+from app.routes.notebook import notebook_blueprint
 
-app = Flask(__name__)
 
-allowed_origins = ["http://localhost:5001", "http://localhost:3000"]
 
-CORS(app, resources={
-    r"/*": {"origins": allowed_origins}
-})
+
+def create_app():
+    app = Flask(__name__)
+    app.config['SQLALCHEMY_DATABASE_URI'] = 'postgresql://server:password-server@localhost:5432/server_db'
+    db.init_app(app)
+
+    allowed_origins = ["http://localhost:5001", "http://localhost:3000"]
+    CORS(app, resources={
+        r"/*": {"origins": allowed_origins}
+    })
+
+    return app
+
+app = create_app()
 
 app.register_blueprint(notebook_blueprint)
 

webapp/src/App.js

@@ -76,7 +76,6 @@ const App = () => {
   const handleNewNotebookClick = () => {
     if (handleUnsavedChanges()) {
       NotebookModel.createNotebook(`${baseUrl}work`).then((data) => {
-        console.log('Created new notebook:', data);
         const notebookPath = `${baseUrl}${data.path}`
         NotebookModel.fetchNotebook(notebookPath).then((data) => {
           setNotebook(data);

webapp/src/components/notebook/content/Runs.js

@@ -4,7 +4,7 @@ function Runs() {
   const [data, setData] = useState(null);
 
   useEffect(() => {
-    fetch('http://localhost:5002/notebook')
+    fetch('http://localhost:5002/notebook/all')
       .then(response => response.json())
       .then(data => setData(data))
       .catch(error => console.error('Error:', error));