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

Merged
merged 115 commits into from
Jul 1, 2025
Merged
Show file tree
Hide file tree
Changes from 15 commits
Commits
Show all changes
115 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
21bb024
initial frontend
samfreund Apr 30, 2025
0be2e8d
make NNPM serializable
samfreund Apr 30, 2025
336a2b6
Merge branch 'main' into migrate-od
samfreund Apr 30, 2025
f89ea5b
Discard changes to photon-server/src/main/resources/web/index.html
samfreund Apr 30, 2025
58c70c3
write rename and delete
samfreund Apr 30, 2025
59d50b7
I think frontend is done?
samfreund Apr 30, 2025
e8df981
add key
samfreund Apr 30, 2025
cd23053
initial exporting
samfreund Apr 30, 2025
d3dbd84
import and export?
samfreund Apr 30, 2025
4eca6b8
various UI bugfixes
samfreund May 1, 2025
668e132
clean up a little
samfreund May 2, 2025
2ed596f
Merge branch 'main' into migrate-od
samfreund May 4, 2025
17e335a
add dependency
samfreund May 4, 2025
9f16f5d
rename config get method
samfreund May 5, 2025
4e6fa80
Merge branch 'main' into migrate-od
samfreund May 6, 2025
25ea9f5
fix issues from the merge
samfreund May 6, 2025
bebdb21
update model name
samfreund May 7, 2025
fbd67ba
frontend rewrite
samfreund May 7, 2025
3f85bbd
Merge branch 'main' into migrate-od
samfreund May 7, 2025
da3ef1a
oops, meant to do it this way
samfreund May 7, 2025
02211ef
nuke 'em
samfreund May 7, 2025
1436993
implement individual export
samfreund May 7, 2025
a3e58bd
Merge branch 'main' into migrate-od
samfreund May 15, 2025
8cf9f9a
Merge branch 'PhotonVision:main' into migrate-od
samfreund Jun 19, 2025
9688679
working nuke
samfreund Jun 19, 2025
947bf22
grammar
samfreund Jun 19, 2025
7addbeb
working export functions
samfreund Jun 21, 2025
e027e86
more copying
samfreund Jun 21, 2025
4e2f8d2
fix resolution display
samfreund Jun 21, 2025
5318c42
fix selection tab
samfreund Jun 21, 2025
7ac1958
maybe fix the TS thing
samfreund Jun 22, 2025
6d50f63
try that
samfreund Jun 22, 2025
9f99acc
let's try that
samfreund Jun 22, 2025
9a8f894
Revert "let's try that"
samfreund Jun 22, 2025
042b601
let's try that
samfreund Jun 22, 2025
e0d973f
oops
samfreund Jun 22, 2025
5ab9e2c
let's try that
samfreund Jun 22, 2025
53b9635
Revert "let's try that"
samfreund Jun 22, 2025
1f545cd
add some error handling
samfreund Jun 22, 2025
3b9dd25
Clean up layout
Gold856 Jun 22, 2025
0cf3506
updated set function
samfreund Jun 22, 2025
79b2d77
Merge branch 'migrate-od' of github.com:samfreund/photonvision into m…
samfreund Jun 22, 2025
c94e642
debugging stuff
samfreund Jun 22, 2025
3d2196b
check other thing
samfreund Jun 22, 2025
7e1e958
just trying this for funsies
samfreund Jun 23, 2025
4ed8cd6
clean up model path
samfreund Jun 23, 2025
5a316d3
more logging
samfreund Jun 23, 2025
d555a33
add parsing to front-end, not back-end
samfreund Jun 23, 2025
8cb352a
okay, let's try this
samfreund Jun 23, 2025
da4c128
fix errors
samfreund Jun 23, 2025
79841fb
fix null exception
samfreund Jun 23, 2025
f361545
more strict typing
samfreund Jun 23, 2025
793a5bb
log payload
samfreund Jun 23, 2025
322420f
more logging
samfreund Jun 23, 2025
c9ee87b
maybe this does it
samfreund Jun 23, 2025
3cfcc09
format and fix get
samfreund Jun 23, 2025
7cfd3ca
Merge branch 'main' into migrate-od
samfreund Jun 23, 2025
ba89907
formatting
samfreund Jun 23, 2025
ddf062f
start to rewrite docs
samfreund Jun 23, 2025
4223b40
color scheme stuff
samfreund Jun 23, 2025
0d920f6
Documentation of bulk export
samfreund Jun 23, 2025
c493123
Update NeuralNetworkModelManager.java
samfreund Jun 23, 2025
c2ca2f6
fail import on extant model file
samfreund Jun 24, 2025
17c697b
move logger outside of switch statement
samfreund Jun 24, 2025
a25c6e4
remove extraneous logger
samfreund Jun 24, 2025
86ab48a
Merge branch 'main' into migrate-od
samfreund Jun 24, 2025
89e7f4c
add path supported method
samfreund Jun 27, 2025
5f5ac81
change config provider to use updated function
samfreund Jun 27, 2025
85fbcd6
try this ig
samfreund Jun 27, 2025
607b62a
oops, guess that line was redudant
samfreund Jun 27, 2025
96bc5c9
add path support
samfreund Jun 27, 2025
ab57d20
oops, gotta add key support too
samfreund Jun 27, 2025
cc6cbba
ui stuff
samfreund Jun 27, 2025
b8e8a57
update docs
samfreund Jun 27, 2025
91f09cc
Merge branch 'main' into migrate-od
samfreund Jun 27, 2025
f9561e7
linting
samfreund Jun 27, 2025
2b5bad6
move bulk import location
samfreund Jun 27, 2025
7e1a9e8
update server
samfreund Jun 27, 2025
7c4e67c
bah linting
samfreund Jun 27, 2025
38960f2
Merge branch 'main' into migrate-od
gerth2 Jun 28, 2025
3e96581
progress bar for bulk import
samfreund Jun 28, 2025
70eb312
Merge branch 'main' into migrate-od
samfreund Jun 29, 2025
a2fdd1a
rename nuke to clear
samfreund Jun 30, 2025
ff9bc78
remove leftover logging
samfreund Jul 1, 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 @@ -214,7 +214,12 @@ public void load() {

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

@Override
Expand Down Expand Up @@ -484,4 +489,11 @@ 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
throw new UnsupportedOperationException(
"Unimplemented method 'saveUploadedNeuralNetworkProperties'");
}
}
Loading
Loading