From e153f2d5ae4641085f14a9ea8b3ea40d70868ab1 Mon Sep 17 00:00:00 2001
From: molotgor <molotgog@gmail.com>
Date: Wed, 19 Jun 2024 14:57:51 +0400
Subject: [PATCH] add pvc for jupyter packages and use it in provider

---
 Dockerfile                                    |  1 +
 .../jupyter-notebook/Dockerfile               |  2 +-
 server.py                                     | 22 +++++--------------
 3 files changed, 8 insertions(+), 17 deletions(-)

diff --git a/Dockerfile b/Dockerfile
index 759b212..5ff60b8 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -20,6 +20,7 @@ ENV PATH="${HOME}/.local/bin:${PATH}"
 ENV XDG_CACHE_HOME="${HOME}/.cache"
 ENV PYTHONPATH="${HOME}/.local/lib/python3.9/site-packages:${PYTHONPATH}"
 ENV PIP_CONFIG_FILE="${HOME}/.pip/pip.conf"
+ENV PYTHONPATH="${PYTHONPATH}:/opt/conda/lib/python3.9/site-packages"
 
 # Install any needed dependencies specified in requirements.txt
 RUN pip install -r requirements.txt
diff --git a/local-run/with-jupyter-notebook/jupyter-notebook/Dockerfile b/local-run/with-jupyter-notebook/jupyter-notebook/Dockerfile
index afe1cf2..455daa0 100644
--- a/local-run/with-jupyter-notebook/jupyter-notebook/Dockerfile
+++ b/local-run/with-jupyter-notebook/jupyter-notebook/Dockerfile
@@ -1,3 +1,3 @@
-FROM jupyter/datascience-notebook
+FROM jupyter/datascience-notebook:python-3.9
 
 RUN echo "c.ServerApp.base_url = '/jupyter/'" >> /etc/jupyter/jupyter_server_config.py
\ No newline at end of file
diff --git a/server.py b/server.py
index 1a5a9b0..f59faa6 100644
--- a/server.py
+++ b/server.py
@@ -12,13 +12,7 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-import sys
-import os
-
-print("Executable at %s" % sys.executable)
-print("looking for modules at %s" % sys.path)
 os.system('pip list')
-os.system('pip show papermill')
 
 import subprocess
 import sys
@@ -30,7 +24,7 @@
 from glob import glob
 import json
 import datetime
-import os.path
+import os
 import asyncio
 from argparse import ArgumentParser
 
@@ -57,10 +51,6 @@ def createDir(path: str):
         os.makedirs(path)
 
 
-def installRequirements(path):
-    subprocess.check_call(" ".join([sys.executable, "-m pip install --no-cache-dir -r", path]))
-
-
 def readConf(path: str):
     global notebooksDir
     global resultsDir
@@ -69,17 +59,17 @@ def readConf(path: str):
         file = open(path, "r")
         result = json.load(file)
         notebooksDir = result.get('notebooks', notebooksDir)
+        print('notebooksDir=%s' % notebooksDir)
         if notebooksDir:
             createDir(notebooksDir)
         resultsDir = result.get('results', resultsDir)
+        print('resultsDir=%s' % resultsDir)
         if resultsDir:
             createDir(resultsDir)
         logDir = result.get('logs', logDir)
+        print('logDir=%s' % logDir)
         if logDir:
             createDir(logDir)
-        # reqDir = result.get('requirements', None)
-        # if reqDir:
-        #    installRequirements(reqDir)
     except Exception as e:
         print(e)
 
@@ -265,7 +255,7 @@ async def reqArguments(req: Request):
     return web.json_response(params)
 
 
-async def launchNotebook(input, arguments=None, file_name=None):
+def launchNotebook(input, arguments=None, file_name=None):
     global serverStatus
     print('launching notebook {input} with {arguments}'.format(input=input, arguments=arguments))
     serverStatus = 'busy'
@@ -318,7 +308,7 @@ async def reqLaunch(req: Request):
     output_path = resultsDir + '/%s.jsonl' % str(file_name)
     parameters = await req.json()
     parameters['output_path'] = output_path
-    asyncio.shield(spawn(req, launchNotebook(pathConverted, parameters, file_name)))
+    launchNotebook(pathConverted, parameters, file_name)
     return web.json_response({'path': replacePathLocalToServer(output_path)})