Skip to content
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.

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

Add functionality for installing extensions #637

Open
wants to merge 25 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
25 commits
Select commit Hold shift + click to select a range
35150e9
Add functionality for installing extensions
ehennestad Nov 23, 2024
bd40894
Minor fixes
ehennestad Nov 23, 2024
132aa67
Update comment
ehennestad Nov 23, 2024
781f303
Add comment + print message when extension has been installed
ehennestad Nov 23, 2024
eab998e
Update installExtension.m
ehennestad Nov 23, 2024
650ceec
Update matnwb_createNwbInstallExtension.m
ehennestad Nov 23, 2024
ff95e98
Add workflow for updating nwbInstallExtension
ehennestad Nov 28, 2024
bb3514b
Add option to save extension in custom location
ehennestad Nov 28, 2024
184fa81
Create InstallExtensionTest.m
ehennestad Nov 28, 2024
ddbe9dc
Update docstring
ehennestad Dec 6, 2024
44a6a20
Merge branch 'master' into add-nwb-install-extension
ehennestad Dec 12, 2024
24c3899
Merge branch 'add-nwb-install-extension' of https://github.com/Neurod…
ehennestad Dec 12, 2024
da00cea
Change dispExtensionInfo to return info instead of displaying + add test
ehennestad Dec 12, 2024
40b7703
Reorganize code into separate functions and add tests
ehennestad Dec 12, 2024
e3b4906
Merge branch 'master' into add-nwb-install-extension
ehennestad Dec 12, 2024
6faba21
Minor changes to improve test coverage
ehennestad Dec 12, 2024
a74a2d2
add nwbInstallExtension to docs
ehennestad Dec 12, 2024
16877f9
Update update_extension_list.yml
ehennestad Dec 12, 2024
0bc735f
Update downloadExtensionRepository.m
ehennestad Dec 12, 2024
67680c2
Update docstring for nwbInstallExtension
ehennestad Jan 2, 2025
b2e679a
Fix docstring indentation in nwbInstallExtension
ehennestad Jan 2, 2025
69f07d9
Add doc pages describing how to use (ndx) extensions
ehennestad Jan 2, 2025
07d5162
Fix typo
ehennestad Jan 2, 2025
13b0d1b
Update +tests/+unit/InstallExtensionTest.m
ehennestad Jan 9, 2025
32342ed
Update docs/source/pages/getting_started/using_extensions/generating_…
ehennestad Jan 9, 2025
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
25 changes: 25 additions & 0 deletions +matnwb/+extension/+internal/buildRepoDownloadUrl.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,25 @@
function downloadUrl = buildRepoDownloadUrl(repositoryUrl, branchName)
% buildRepoDownloadUrl - Build a download URL for a given repository and branch
arguments
repositoryUrl (1,1) string
branchName (1,1) string
end

if endsWith(repositoryUrl, '/')
repositoryUrl = extractBefore(repositoryUrl, strlength(repositoryUrl));
end

if contains(repositoryUrl, 'github.com')
downloadUrl = sprintf( '%s/archive/refs/heads/%s.zip', repositoryUrl, branchName );

elseif contains(repositoryUrl, 'gitlab.com')
repoPathSegments = strsplit(repositoryUrl, '/');
repoName = repoPathSegments{end};
downloadUrl = sprintf( '%s/-/archive/%s/%s-%s.zip', ...
repositoryUrl, branchName, repoName, branchName);

else
error('NWB:BuildRepoDownloadUrl:UnsupportedRepository', ...
'Expected repository URL to point to a GitHub or a GitLab repository')
end
end
46 changes: 46 additions & 0 deletions +matnwb/+extension/+internal/downloadExtensionRepository.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,46 @@
function [wasDownloaded, repoTargetFolder] = downloadExtensionRepository(...
repositoryUrl, repoTargetFolder, extensionName)
% downloadExtensionRepository - Download the repository (source) for an extension
%
% The metadata for a neurodata extension only provides the url to the
% repository containing the extension, not the full download url. This
% function tries to download a zipped version of the repository from
% either the "main" or the "master" branch.
%
% Works for repositories located on GitHub or GitLab
%
% As of Dec. 2024, this approach works for all registered extensions

arguments
repositoryUrl (1,1) string
repoTargetFolder (1,1) string
extensionName (1,1) string
end

import matnwb.extension.internal.downloadZippedRepo
import matnwb.extension.internal.buildRepoDownloadUrl

defaultBranchNames = ["main", "master"];

wasDownloaded = false;
for i = 1:2
try
branchName = defaultBranchNames(i);
downloadUrl = buildRepoDownloadUrl(repositoryUrl, branchName);
repoTargetFolder = downloadZippedRepo(downloadUrl, repoTargetFolder);
wasDownloaded = true;
break
catch ME
if strcmp(ME.identifier, 'MATLAB:webservices:HTTP404StatusCodeError')
continue

Check warning on line 35 in +matnwb/+extension/+internal/downloadExtensionRepository.m

View check run for this annotation

Codecov / codecov/patch

+matnwb/+extension/+internal/downloadExtensionRepository.m#L35

Added line #L35 was not covered by tests
elseif strcmp(ME.identifier, 'NWB:BuildRepoDownloadUrl:UnsupportedRepository')
error('NWB:InstallExtension:UnsupportedRepository', ...
['Extension "%s" is located in an unsupported repository ', ...
'/ source location. \nPlease create an issue on MatNWB''s ', ...
'github page'], extensionName)
else
rethrow(ME)

Check warning on line 42 in +matnwb/+extension/+internal/downloadExtensionRepository.m

View check run for this annotation

Codecov / codecov/patch

+matnwb/+extension/+internal/downloadExtensionRepository.m#L42

Added line #L42 was not covered by tests
end
end
end
end
37 changes: 37 additions & 0 deletions +matnwb/+extension/+internal/downloadZippedRepo.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,37 @@
function repoFolder = downloadZippedRepo(githubUrl, targetFolder)
%downloadZippedRepo - Download a zipped repository

% Create a temporary path for storing the downloaded file.
[~, ~, fileType] = fileparts(githubUrl);
tempFilepath = [tempname, fileType];

% Download the file containing the zipped repository
tempFilepath = websave(tempFilepath, githubUrl);
fileCleanupObj = onCleanup( @(fname) delete(tempFilepath) );

unzippedFiles = unzip(tempFilepath, tempdir);
unzippedFolder = unzippedFiles{1};
if endsWith(unzippedFolder, filesep)
unzippedFolder = unzippedFolder(1:end-1);
end

[~, repoFolderName] = fileparts(unzippedFolder);
targetFolder = fullfile(targetFolder, repoFolderName);

if isfolder(targetFolder)
try
rmdir(targetFolder, 's')
catch
error('Could not delete previously downloaded extension which is located at:\n"%s"', targetFolder)

Check warning on line 25 in +matnwb/+extension/+internal/downloadZippedRepo.m

View check run for this annotation

Codecov / codecov/patch

+matnwb/+extension/+internal/downloadZippedRepo.m#L22-L25

Added lines #L22 - L25 were not covered by tests
end
else
% pass
end

movefile(unzippedFolder, targetFolder);

% Delete the temp zip file
clear fileCleanupObj

repoFolder = targetFolder;
end
16 changes: 16 additions & 0 deletions +matnwb/+extension/getExtensionInfo.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
function metadata = getExtensionInfo(extensionName)
% getExtensionInfo - Get metadata for specified extension

arguments
extensionName (1,1) string
end

T = matnwb.extension.listExtensions();
isMatch = T.name == extensionName;
extensionList = join( compose(" %s", [T.name]), newline );
assert( ...
any(isMatch), ...
'NWB:DisplayExtensionMetadata:ExtensionNotFound', ...
'Extension "%s" was not found in the extension catalog:\n%s', extensionName, extensionList)
metadata = table2struct(T(isMatch, :));
end
6 changes: 6 additions & 0 deletions +matnwb/+extension/installAll.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
function installAll()
T = matnwb.extension.listExtensions();
for i = 1:height(T)
matnwb.extension.installExtension( T.name(i) )
end
end
49 changes: 49 additions & 0 deletions +matnwb/+extension/installExtension.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
function installExtension(extensionName, options)
% installExtension - Install NWB extension from Neurodata Extensions Catalog
%
% matnwb.extension.nwbInstallExtension(extensionName) installs a Neurodata
% Without Borders (NWB) extension from the Neurodata Extensions Catalog to
% extend the functionality of the core NWB schemas.

arguments
extensionName (1,1) string
options.savedir (1,1) string = misc.getMatnwbDir()

Check warning on line 10 in +matnwb/+extension/installExtension.m

View check run for this annotation

Codecov / codecov/patch

+matnwb/+extension/installExtension.m#L10

Added line #L10 was not covered by tests
end

import matnwb.extension.internal.downloadExtensionRepository

repoTargetFolder = fullfile(userpath, "NWB-Extension-Source");
if ~isfolder(repoTargetFolder); mkdir(repoTargetFolder); end

T = matnwb.extension.listExtensions();
isMatch = T.name == extensionName;

extensionList = join( compose(" %s", [T.name]), newline );
assert( ...
any(isMatch), ...
'NWB:InstallExtension:ExtensionNotFound', ...
'Extension "%s" was not found in the extension catalog:\n', extensionList)

repositoryUrl = T{isMatch, 'src'};

[wasDownloaded, repoTargetFolder] = ...
downloadExtensionRepository(repositoryUrl, repoTargetFolder, extensionName);

if ~wasDownloaded
error('NWB:InstallExtension:DownloadFailed', ...
'Failed to download spec for extension "%s"', extensionName)

Check warning on line 34 in +matnwb/+extension/installExtension.m

View check run for this annotation

Codecov / codecov/patch

+matnwb/+extension/installExtension.m#L33-L34

Added lines #L33 - L34 were not covered by tests
end
L = dir(fullfile(repoTargetFolder, 'spec', '*namespace.yaml'));
assert(...
~isempty(L), ...
'NWB:InstallExtension:NamespaceNotFound', ...
'No namespace file was found for extension "%s"', extensionName ...
)
assert(...
numel(L)==1, ...
'NWB:InstallExtension:MultipleNamespacesFound', ...
'More than one namespace file was found for extension "%s"', extensionName ...
)
generateExtension( fullfile(L.folder, L.name), 'savedir', options.savedir );
fprintf("Installed extension ""%s"".\n", extensionName)
end
53 changes: 53 additions & 0 deletions +matnwb/+extension/listExtensions.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,53 @@
function extensionTable = listExtensions(options)
arguments
options.Refresh (1,1) logical = false
end

persistent extensionRecords

if isempty(extensionRecords) || options.Refresh
catalogUrl = "https://raw.githubusercontent.com/nwb-extensions/nwb-extensions.github.io/refs/heads/main/data/records.json";
extensionRecords = jsondecode(webread(catalogUrl));
extensionRecords = consolidateStruct(extensionRecords);

extensionRecords = struct2table(extensionRecords);

fieldsKeep = ["name", "version", "last_updated", "src", "license", "maintainers", "readme"];
extensionRecords = extensionRecords(:, fieldsKeep);

for name = fieldsKeep
if ischar(extensionRecords.(name){1})
extensionRecords.(name) = string(extensionRecords.(name));
end
end
end
extensionTable = extensionRecords;
end

function structArray = consolidateStruct(S)
% Get all field names of S
mainFields = fieldnames(S);

% Initialize an empty struct array
structArray = struct();

% Iterate over each field of S
for i = 1:numel(mainFields)
subStruct = S.(mainFields{i}); % Extract sub-struct

% Add all fields of the sub-struct to the struct array
fields = fieldnames(subStruct);
for j = 1:numel(fields)
structArray(i).(fields{j}) = subStruct.(fields{j});
end
end

% Ensure consistency by filling missing fields with []
allFields = unique([fieldnames(structArray)]);
for i = 1:numel(structArray)
missingFields = setdiff(allFields, fieldnames(structArray(i)));
for j = 1:numel(missingFields)
structArray(i).(missingFields{j}) = [];

Check warning on line 50 in +matnwb/+extension/listExtensions.m

View check run for this annotation

Codecov / codecov/patch

+matnwb/+extension/listExtensions.m#L50

Added line #L50 was not covered by tests
end
end
end
87 changes: 87 additions & 0 deletions +tests/+unit/InstallExtensionTest.m
Original file line number Diff line number Diff line change
@@ -0,0 +1,87 @@
classdef InstallExtensionTest < matlab.unittest.TestCase

methods (TestClassSetup)
function setupClass(testCase)
% Get the root path of the matnwb repository
rootPath = misc.getMatnwbDir();

% Use a fixture to add the folder to the search path
testCase.applyFixture(matlab.unittest.fixtures.PathFixture(rootPath));

% Use a fixture to create a temporary working directory
testCase.applyFixture(matlab.unittest.fixtures.WorkingFolderFixture);
generateCore('savedir', '.');
end
end

methods (Test)
function testInstallExtensionFailsWithNoInputArgument(testCase)
testCase.verifyError(...
@(varargin) nwbInstallExtension(), ...
'NWB:InstallExtension:MissingArgument')
end

function testInstallExtension(testCase)
nwbInstallExtension("ndx-miniscope", 'savedir', '.')

testCase.verifyTrue(isfolder('./+types/+ndx_miniscope'), ...
'Folder with extension types does not exist')
end

function testUseInstalledExtension(testCase)
nwbObject = testCase.initNwbFile();

miniscopeDevice = types.ndx_miniscope.Miniscope(...
'deviceType', 'test_device', ...
'compression', 'GREY', ...
'frameRate', '30fps', ...
'framesPerFile', int8(100) );

nwbObject.general_devices.set('TestMiniscope', miniscopeDevice);

testCase.verifyClass(nwbObject.general_devices.get('TestMiniscope'), ...
'types.ndx_miniscope.Miniscope')
end

function testGetExtensionInfo(testCase)
extensionName = "ndx-miniscope";
metadata = matnwb.extension.getExtensionInfo(extensionName);
testCase.verifyClass(metadata, 'struct')
testCase.verifyEqual(metadata.name, extensionName)
end

function testDownloadUnknownRepository(testCase)
repositoryUrl = "https://www.unknown-repo.com/anon/my_nwb_extension";
testCase.verifyError(...
@() matnwb.extension.internal.downloadExtensionRepository(repositoryUrl, "", "my_nwb_extension"), ...
'NWB:InstallExtension:UnsupportedRepository');
end

function testBuildRepoDownloadUrl(testCase)

import matnwb.extension.internal.buildRepoDownloadUrl

repoUrl = buildRepoDownloadUrl('https://github.com/user/test', 'main');
testCase.verifyEqual(repoUrl, 'https://github.com/user/test/archive/refs/heads/main.zip')

repoUrl = buildRepoDownloadUrl('https://github.com/user/test/', 'main');
testCase.verifyEqual(repoUrl, 'https://github.com/user/test/archive/refs/heads/main.zip')

repoUrl = buildRepoDownloadUrl('https://gitlab.com/user/test', 'main');
testCase.verifyEqual(repoUrl, 'https://gitlab.com/user/test/-/archive/main/test-main.zip')

testCase.verifyError(...
@() buildRepoDownloadUrl('https://unsupported.com/user/test', 'main'), ...
'NWB:BuildRepoDownloadUrl:UnsupportedRepository')
end
end

methods (Static)
function nwb = initNwbFile()
nwb = NwbFile( ...
'session_description', 'test file for nwb extension', ...
'identifier', 'export_test', ...
'session_start_time', datetime("now", 'TimeZone', 'local') );
end
end
end
49 changes: 49 additions & 0 deletions .github/workflows/update_extension_list.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,49 @@
name: Update extension list

on:
schedule:
# Run at 8:15 on working days [Minute Hour Day Month Weekdays]
# Run this 15 minutes after source repo is updated
# https://github.com/nwb-extensions/nwb-extensions.github.io/blob/main/.github/workflows/data.yml
- cron: 15 8 * * 0-5
workflow_dispatch:

permissions:
contents: write

jobs:
update_extension_list:
runs-on: ubuntu-latest
steps:
# Use deploy key to push back to protected branch
- name: Checkout repository using deploy key
uses: actions/checkout@v4
with:
ref: refs/heads/main
ssh-key: ${{ secrets.DEPLOY_KEY }}

- name: Install MATLAB
uses: matlab-actions/setup-matlab@v2

- name: Update extension list in nwbInstallExtensions
uses: matlab-actions/run-command@v2
with:
command: |
addpath(genpath("tools"));
matnwb_createNwbInstallExtension();

- name: Commit the updated nwbInstallExtension function
run: |
set -e # Exit script on error
git config user.name "${{ github.workflow }} by ${{ github.actor }}"
git config user.email "<>"
git pull --rebase # Ensure the branch is up-to-date

if [[ -n $(git status --porcelain nwbInstallExtension.m) ]]; then
git add nwbInstallExtension.m
git commit -m "Update list of extensions in nwbInstallExtension"
git push
else
echo "Nothing to commit"
fi

10 changes: 10 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -8,4 +8,14 @@ workspace/
.DS_Store
+tests/env.mat

# Ignore everything in the +types/ folder
+types/*

# Explicitly include these subdirectories
!+types/+core/
!+types/+hdmf_common/
!+types/+hdmf_experimental/
!+types/+untyped/
!+types/+util/

docs/build
Loading
Loading