From f61280ef0015c41c2cca9fa5672b5a59027fa4d3 Mon Sep 17 00:00:00 2001
From: Kurt Hutten <k.hutten@protonmail.ch>
Date: Sun, 31 Jul 2022 08:42:39 +1000
Subject: [PATCH] Kurt 611 (#612)

* disable python exectution

* update prod url
---
 app/api/src/docker/cadquery/Dockerfile    |  4 +-
 app/api/src/docker/cadquery/cadquery.ts   |  6 +--
 app/api/src/docker/cadquery/runCQ.ts      | 55 ++++++++++++-----------
 app/web/src/helpers/cadPackages/common.ts |  2 +-
 4 files changed, 34 insertions(+), 33 deletions(-)

diff --git a/app/api/src/docker/cadquery/Dockerfile b/app/api/src/docker/cadquery/Dockerfile
index 86bfb7d..4c9eadf 100644
--- a/app/api/src/docker/cadquery/Dockerfile
+++ b/app/api/src/docker/cadquery/Dockerfile
@@ -41,8 +41,8 @@ RUN npm install aws-lambda-ric@1.0.0
 RUN conda --version
 
 # Install CadQuery
-RUN conda install -c cadquery -c conda-forge cadquery=master ocp=7.5.2 python=3.8
-RUN conda info
+# RUN conda install -c cadquery -c conda-forge cadquery=master ocp=7.5.2 python=3.8
+# RUN conda info
 
 # Get a copy of cq-cli from GitHub
 RUN git clone https://github.com/CadQuery/cq-cli.git
diff --git a/app/api/src/docker/cadquery/cadquery.ts b/app/api/src/docker/cadquery/cadquery.ts
index 30399ca..088d53d 100644
--- a/app/api/src/docker/cadquery/cadquery.ts
+++ b/app/api/src/docker/cadquery/cadquery.ts
@@ -9,7 +9,7 @@ const stl = async (req, _context, callback) => {
   console.log('eventBody', eventBody)
 
   const { file, settings } = JSON.parse(eventBody)
-  const { error, consoleMessage, fullPath, tempFile } = await runCQ({
+  const { error, fullPath } = await runCQ({
     file,
     settings,
   })
@@ -17,8 +17,8 @@ const stl = async (req, _context, callback) => {
     error,
     callback,
     fullPath,
-    consoleMessage,
-    tempFile,
+    consoleMessage: '',
+    tempFile : '',
   })
 }
 
diff --git a/app/api/src/docker/cadquery/runCQ.ts b/app/api/src/docker/cadquery/runCQ.ts
index 6a1db1d..40b70a7 100644
--- a/app/api/src/docker/cadquery/runCQ.ts
+++ b/app/api/src/docker/cadquery/runCQ.ts
@@ -30,31 +30,32 @@ export const runCQ = async ({
   ].join(' ')
   console.log('command', command)
   let consoleMessage = ''
-  try {
-    consoleMessage = await runCommand(command, 30000)
-    const params = JSON.parse(
-      await readFile(customizerPath, { encoding: 'ascii' })
-    )
-    await writeFiles(
-      [
-        {
-          file: JSON.stringify({
-            customizerParams: params,
-            consoleMessage,
-            type: 'stl',
-          }),
-          fileName: 'metadata.json',
-        },
-      ],
-      tempFile
-    )
-    await runCommand(
-      `cat ${stlPath} /var/task/cadhub-concat-split /tmp/${tempFile}/metadata.json | gzip > ${fullPath}`,
-      15000,
-      true
-    )
-    return { consoleMessage, fullPath, tempFile }
-  } catch (error) {
-    return { error: consoleMessage || error, fullPath }
-  }
+  return { error: 'python execution currently disabled, see: https://github.com/Irev-Dev/cadhub/issues/611', fullPath }
+  // try {
+  //   consoleMessage = await runCommand(command, 30000)
+  //   const params = JSON.parse(
+  //     await readFile(customizerPath, { encoding: 'ascii' })
+  //   )
+  //   await writeFiles(
+  //     [
+  //       {
+  //         file: JSON.stringify({
+  //           customizerParams: params,
+  //           consoleMessage,
+  //           type: 'stl',
+  //         }),
+  //         fileName: 'metadata.json',
+  //       },
+  //     ],
+  //     tempFile
+  //   )
+  //   await runCommand(
+  //     `cat ${stlPath} /var/task/cadhub-concat-split /tmp/${tempFile}/metadata.json | gzip > ${fullPath}`,
+  //     15000,
+  //     true
+  //   )
+  //   return { consoleMessage, fullPath, tempFile }
+  // } catch (error) {
+  //   return { error: consoleMessage || error, fullPath }
+  // }
 }
diff --git a/app/web/src/helpers/cadPackages/common.ts b/app/web/src/helpers/cadPackages/common.ts
index bacd017..bf356f1 100644
--- a/app/web/src/helpers/cadPackages/common.ts
+++ b/app/web/src/helpers/cadPackages/common.ts
@@ -5,7 +5,7 @@ import type { Camera } from 'src/helpers/hooks/useIdeState'
 
 export const lambdaBaseURL =
   process.env.CAD_LAMBDA_BASE_URL ||
-  'https://oxt2p7ddgj.execute-api.us-east-1.amazonaws.com/prod'
+  'https://2inlbple1b.execute-api.us-east-1.amazonaws.com/prod2/'
 
 export const stlToGeometry = (url) =>
   new Promise((resolve, reject) => {