Skip to content

Migrate NNM Settings to SQLITE #1894

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

Draft
wants to merge 31 commits into
base: main
Choose a base branch
from
Draft
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
31 commits
Select commit Hold shift + click to select a range
22e90e2
apparently it closes on you
samfreund Apr 14, 2025
8ae7f65
add neuralnetworkproperties
samfreund Apr 14, 2025
f258764
in progress
samfreund Apr 14, 2025
cb822b6
Merge branch 'main' into migrate-od
samfreund Apr 14, 2025
59f0249
lint
samfreund Apr 14, 2025
3d24a9d
Merge branch 'main' into migrate-od
samfreund Apr 14, 2025
21576b5
Merge branch 'main' into migrate-od
samfreund Apr 14, 2025
17b9e1c
Merge branch 'main' into migrate-od
samfreund Apr 15, 2025
322532f
Merge branch 'main' into migrate-od
samfreund Apr 15, 2025
4f9ada1
backend is done?
samfreund Apr 15, 2025
9c1ae22
delete parsing test
samfreund Apr 15, 2025
c1aa1aa
stub out request handles and redo import
samfreund Apr 15, 2025
4c738ba
rename and delete
samfreund Apr 15, 2025
9362ddb
remove json annotations
samfreund Apr 15, 2025
bfc9371
document and change models to use a UID
samfreund Apr 15, 2025
751fc39
nuclear option
samfreund Apr 16, 2025
b74aa88
switch model version to an optional
samfreund Apr 22, 2025
9b09e0c
Merge branch 'main' into migrate-od
samfreund Apr 22, 2025
de71734
lint
samfreund Apr 22, 2025
ca0c448
update to use record
samfreund Apr 22, 2025
d6dcc95
rewrite requests to remove excess lines
samfreund Apr 22, 2025
57c5a6c
Merge branch 'main' into migrate-od
samfreund Apr 22, 2025
3c7cd0e
write some comments to make adding new platforms easier
samfreund Apr 25, 2025
7aa753a
Merge branch 'main' into migrate-od
samfreund Apr 28, 2025
83bf324
add RKNN dependency to server
samfreund Apr 28, 2025
2db4b7a
rewrite versioning to use enum in NNMM
samfreund Apr 29, 2025
642cf3a
renaming for clarity
samfreund Apr 29, 2025
761e096
server implementation of versioning method change for NNMM
samfreund Apr 29, 2025
11406bf
remove export stub
samfreund Apr 29, 2025
94535e7
remove readTree
samfreund Apr 29, 2025
47729dc
rewrite requesthandle to use records
samfreund Apr 30, 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
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ const handleImport = async () => {
});

axios
.post("/utils/importObjectDetectionModel", formData, {
.post("/objectdetection/import", formData, {
headers: { "Content-Type": "multipart/form-data" }
})
.then((response) => {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -294,6 +294,10 @@ public boolean saveUploadedAprilTagFieldLayout(Path uploadPath) {
return m_provider.saveUploadedAprilTagFieldLayout(uploadPath);
}

public boolean saveUploadedNeuralNetworkProperties(Path uploadPath) {
return m_provider.saveUploadedNeuralNetworkProperties(uploadPath);
}

public void requestSave() {
logger.trace("Requesting save...");
saveRequestTimestamp = System.currentTimeMillis();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -41,4 +41,6 @@ public void clearConfig() {
public abstract boolean saveUploadedNetworkConfig(Path uploadPath);

public abstract boolean saveUploadedAprilTagFieldLayout(Path uploadPath);

public abstract boolean saveUploadedNeuralNetworkProperties(Path uploadPath);
}
Original file line number Diff line number Diff line change
Expand Up @@ -213,7 +213,12 @@ public void load() {

this.config =
new PhotonConfiguration(
hardwareConfig, hardwareSettings, networkConfig, atfl, cameraConfigurations);
hardwareConfig,
hardwareSettings,
networkConfig,
atfl,
new NeuralNetworkPropertyManager(),
cameraConfigurations);
}

@Override
Expand Down Expand Up @@ -481,4 +486,12 @@ private void saveAndWriteTask() {
public void unloadCameraConfigs() {
this.config.getCameraConfigurations().clear();
}

@Override
public boolean saveUploadedNeuralNetworkProperties(Path uploadPath) {
// TODO I'm not implementing this cause nobody with the legacy config is gonna have one of these

System.exit(1);
return false;
}
}
Loading
Loading