Skip to content

[IA-4336] Add environments metadata file types to welder #4401

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
LizBaldo wants to merge 10 commits into
base: dev
Choose a base branch
from
Draft

[IA-4336] Add environments metadata file types to welder #4401

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
903faac
add environments metadata file types to welder
LizBaldo Oct 26, 2023
3f62723
experiment with regex pattern
LizBaldo Oct 26, 2023
4dd5eb0
match multi patern from rstudio
LizBaldo Oct 26, 2023
2170415
remove file lock
LizBaldo Oct 27, 2023
c77b1bf
add logging to check the regex
LizBaldo Nov 1, 2023
167be5d
back to the full regex that I want to use
LizBaldo Nov 2, 2023
a67297d
get around the ipynb lock for now
LizBaldo Nov 2, 2023
90c09df
no need to log, the regex is working as expected
LizBaldo Nov 3, 2023
2ec1f96
also sync the notebook file!
LizBaldo Nov 3, 2023
486a8ac
Merge branch 'dev' into IA-4335-terra-docker-refactoring-poc
LizBaldo Nov 8, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion src/analysis/AnalysisLauncher.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -782,7 +782,6 @@ const AnalysisEditorFrame = ({ styles, mode, analysisName, toolLabel, workspace,

useOnMount(() => {
const cloudStorageDirectory = `gs://${bucketName}/notebooks`;

const setUpAnalysis = _.flow(
Utils.withBusyState(setBusy),
withErrorReporting('Error setting up analysis')
Expand Down
7 changes: 4 additions & 3 deletions src/analysis/utils/tool-utils.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -180,9 +180,10 @@ export const toolExtensionDisplay: Partial<Record<ToolLabel, ExtensionDisplay[]>
};
export const getPatternFromRuntimeTool = (toolLabel: RuntimeToolLabel): string => {
const patterns: Record<RuntimeToolLabel, string> = {
[runtimeToolLabels.RStudio]: '.+(\\.R|\\.Rmd)$',
[runtimeToolLabels.Jupyter]: '.*\\.ipynb',
[runtimeToolLabels.JupyterLab]: '.*\\.ipynb',
// Adding suffixes to conda, pip, and poetry environments (only conda supports R)
[runtimeToolLabels.RStudio]: '.+(\\.R|\\.Rmd|\\.yml)$',
[runtimeToolLabels.Jupyter]: '.+(\\.ipynb|\\.yml|\\.txt|\\.lock|\\.toml)$',
[runtimeToolLabels.JupyterLab]: '.+(\\.ipynb|\\.yml|\\.txt|\\.lock|\\.toml)$',
};
return patterns[toolLabel];
};
Expand Down