Skip to content

Commit a44d9e6

Browse files
committed
Merge commit '6ab30471c7935978974e3275487f33a5b4b630d4' into fix_supersetVenvMacOS
2 parents bc99ba8 + 6ab3047 commit a44d9e6

File tree

3 files changed

+30
-2
lines changed

3 files changed

+30
-2
lines changed

pythonCode/med_libs/MEDml/nodes/Analyze.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ def _execute(self, experiment: dict = None, **kwargs) -> json:
6666
if 'plot' in settings and type(settings['plot']) == str:
6767
settings['plot'] = settings['plot'].lower()
6868
# Set saving path for plot_model
69-
settings['save'] = Path("/tmp") if platform.system().lower() == "darwin" else True
69+
settings['save'] = Path("/tmp") if platform.system().lower() in ["darwin", "linux"] else True
7070
plot_image = experiment['pycaret_exp'].plot_model(model, **settings)
7171

7272
# Save Image into MongoDB

pythonCode/modules/superset/launch.py

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,6 +148,10 @@ def setup_superset(self, port, python_path, app_data_path):
148148
updated_lines.append('WTF_CSRF_ENABLED = False\n')
149149
elif line.startswith('GUEST_ROLE_NAME = "Public"'):
150150
updated_lines.append('GUEST_ROLE_NAME = "Gamma"\n')
151+
elif line.startswith('SESSION_COOKIE_SECURE = False'):
152+
updated_lines.append('SESSION_COOKIE_SECURE = True\n')
153+
elif line.startswith('SESSION_COOKIE_SAMESITE: Literal["None", "Lax", "Strict"] | None = "Lax"'):
154+
updated_lines.append('SESSION_COOKIE_SAMESITE: Literal["None", "Lax", "Strict"] | None = "None"\n')
151155
else:
152156
updated_lines.append(line)
153157

@@ -192,7 +196,7 @@ def setup_superset(self, port, python_path, app_data_path):
192196

193197
# Initialize Superset
194198
print("Initializing Superset...")
195-
self.set_progress(now=self._progress["now"]+step, label="Initializing Superset...")
199+
self.set_progress(now=self._progress["now"]+2*step, label="Initializing Superset...")
196200
result = self.run_command(f'"{superset_path}" init', env)
197201
if "error" in result:
198202
return result

renderer/components/input/MEDprofiles/MEDprofilesPrepareData.jsx

Lines changed: 24 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,30 @@ import { WorkspaceContext } from "../../workspace/workspaceContext"
3131
*
3232
*/
3333
const MEDprofilesPrepareData = () => {
34+
// return disabled message
35+
const warningMessage = (
36+
<div className="h-100 w-100 ">
37+
MEDprofiles module didn't fully pass all stability checks and is currently disabled. It will be enabled in future releases.
38+
To learn more about MEDprofiles, please visit the documentation <a
39+
style={{ color: "#4991dfff"}}
40+
href="https://medomicslab.gitbook.io/medomics-docs/tutorials/design/input-module/medprofiles"
41+
target="_blank"
42+
rel="noopener noreferrer">
43+
here
44+
</a>.
45+
</div>
46+
)
47+
48+
return (
49+
<div className="h-100 w-100">
50+
{/* Disabled warning message */}
51+
<Message
52+
severity="warn"
53+
content={warningMessage}
54+
className="mx-3"
55+
/>
56+
</div>
57+
)
3458
const [binaryFileList, setBinaryFileList] = useState([]) // list of available binary files
3559
const [binaryFilename, setBinaryFilename] = useState("MEDprofiles_bin.pkl") // name under which the MEDprofiles binary file will be saved
3660
const [generatedClassesFolder, setGeneratedClassesFolder] = useState(null) // folder containing the generated MEDclasses

0 commit comments

Comments
 (0)