Gh/updates

applications/diem-core/src/server/routes/executors/spark/spark.job.handlers/handle.spark.config.ts

@@ -3,7 +3,7 @@ import { addTrace } from '@functions';
 import { ISrc, ITgt } from '../spark.interfaces';
 import { py_partition, py_opt_dropcolumns, py_tgt_jdbc, py_session, py_conn_src, py_tgt_nz } from '../spark.pycode/py';
 import { lookupTemplate } from '../../../job.front/job.template';
-import { setValues } from '../../nodepy/python/python.code.handlers/handle.values';
+import { handleValues } from '../../nodepy/python/python.code.handlers/handle.values';
 import { getConnection } from './handle.spark.common';
 
 const codestring = '###__CODE__###';
@@ -22,6 +22,10 @@ export const handleWithConfig: (doc: IJobSchema, code: string) => Promise<string
         return Promise.reject(err);
     }
 
+    if (doc.job.params?.values) {
+        code = await handleValues(code, doc.job.params.values);
+    }
+
     const config: IJobConfig = doc.config;
 
     const local: string =
@@ -102,10 +106,6 @@ export const handleWithConfig: (doc: IJobSchema, code: string) => Promise<string
         code = code.replace(codestring, target_txt);
     }
 
-    if (doc.job.params?.values) {
-        code = await setValues(code, doc.job.params.values);
-    }
-
     // here we create the final construct
 
     return Promise.resolve(code);

applications/diem-jupyterhub/docker/jupyter-experimental/Dockerfile

@@ -17,7 +17,8 @@ USER jovyan
 COPY docker/jupyter-experimental/local/jars/* /usr/local/spark/jars/
 COPY docker/jupyter-experimental/extra_jars/* /usr/local/spark/jars/
 COPY docker/jupyter-experimental/local/requirements.txt /tmp/requirements.txt
-COPY docker/jupyter-experimental/extra_requirements.txt /tmp/extra_requirements.txt
+#COPY docker/jupyter-experimental/extra_requirements.txt /tmp/extra_requirements.txt
+COPY docker/jupyter-experimental/local/extra_requirements.txt /tmp/extra_requirements.txt
 
 WORKDIR /tmp
 

applications/diem-jupyterhub/docker/jupyter-experimental/extra_requirements.txt

@@ -1,2 +1,2 @@
 openai==0.27.4
-langchain==0.0.132
+git+https://github.ibm.com/ai-foundation/bampy.git