Commit graph

587 commits

Author SHA1 Message Date
Julian Stirling
65f172d650 Stop using print statments or root level loggers 2025-09-18 16:21:45 +01:00
Julian Stirling
338d49f9e6 Remove remaining TODOs in favour of issues 2025-09-18 16:10:36 +01:00
Julian Stirling
ef89b536fc Remove assert statements from production code 2025-09-18 16:10:36 +01:00
Julian Stirling
e89ad93535 Specify the camera board not the sensor model during configuration. 2025-09-18 13:00:46 +01:00
Julian Stirling
ca66234379 Apply suggestions from code review of branch reorganise-picamera-tuning-and-recal
Co-authored-by: Joe Knapper <joe.knapper@glasgow.ac.uk>
2025-09-18 13:00:46 +01:00
Julian Stirling
f24272bc7f Set sensor_model as kwarg to SteamingPicameraThing. From this load sensor information. 2025-09-18 13:00:46 +01:00
Julian Stirling
c16a0391df Divide up tuning file modification from camera actions for recalibration.
* Ensure that funtions only called locally by recalibrate utils are private
* Move public API to the top of the recalibrate utils file
* Move files that only alter the tuning dictionary to their own file

This makes the recalibration API used by PiCamera much more clearly defined, which
helps to plan out how to allow for different models.
2025-09-18 13:00:46 +01:00
jaknapper
5566125e6e Update picamera file to HQ parameters 2025-09-18 13:00:46 +01:00
jaknapper
22e7ce4ef0 Change background detect to use lores stream for consistent stream even when scanning. 2025-09-17 17:02:23 +01:00
Joe Knapper
9973221ed9
Merge branch 'neighbour-ratio' into 'v3'
Change neighbour ratio to dx and dy

See merge request openflexure/openflexure-microscope-server!371
2025-09-05 10:56:29 +00:00
jaknapper
980b1e5187 Type hints to inits in scan planners 2025-09-05 11:22:43 +01:00
jaknapper
ce5a22eb64 Added neighbour ratio to spiral scan init 2025-09-05 10:55:21 +01:00
Julian Stirling
8500b479f5 No Never returns from actions in base Thing classes 2025-08-28 09:13:44 +01:00
Julian Stirling
8f78369aaf fixup! Add ANN20X rules to ruff 2025-08-27 18:56:19 +01:00
Julian Stirling
2ce49088e7 Add return typehints to magic methods 2025-08-27 18:56:09 +01:00
Julian Stirling
4c46330959 Add ANN20X rules to ruff 2025-08-27 18:56:08 +01:00
Julian Stirling
d673196671 Add ANN002, and ANN003 rules 2025-08-27 18:54:16 +01:00
Julian Stirling
24233412af Start adding ANN ruff rules 2025-08-27 18:54:15 +01:00
Julian Stirling
b46f429c1f Apply suggestions from code review of branch unify-jpeg-capture
Co-authored-by: Richard Bowman <richard.bowman@cantab.net>
2025-08-27 17:30:51 +01:00
Julian Stirling
5bb742881f Fix typehints and docs for opencv camera 2025-08-27 17:30:51 +01:00
Julian Stirling
b124355fed Fix capture array for raw stream 2025-08-27 17:14:49 +01:00
Julian Stirling
7cd6b11411 Further unification of camera array functionality 2025-08-27 17:14:49 +01:00
Julian Stirling
5484b51a1e Unify JPEG capture, metadata, and saving; reducing duplication 2025-08-27 17:14:49 +01:00
Julian Stirling
4450fda945 Merge branch 'simulation_wrap' into 'v3'
Make simulation image wrap to prevent errors when moving out of range.

Closes #513

See merge request openflexure/openflexure-microscope-server!380
2025-08-27 16:13:24 +00:00
Julian Stirling
2325dced5e Merge branch 'test-server-startup' into 'v3'
Test server startup

See merge request openflexure/openflexure-microscope-server!379
2025-08-27 16:11:34 +00:00
Julian Stirling
19ae7e9802 Merge branch 'pydantic-syntax' into 'v3'
Update BaseModels to use ConfigDict rather than directly use a dictionary

See merge request openflexure/openflexure-microscope-server!381
2025-08-27 16:10:28 +00:00
Julian Stirling
4af4e89c0a Merge branch 'no-uvicorn.error-logs-without-error' into 'v3'
Stop reporting uvicorn.error in log file unless log it is an error

Closes #511

See merge request openflexure/openflexure-microscope-server!375
2025-08-27 14:30:11 +00:00
Julian Stirling
5515d55e6d Merge branch 'error-types' into 'v3'
Tweak a few error types.

Closes #320

See merge request openflexure/openflexure-microscope-server!376
2025-08-27 13:47:26 +00:00
Julian Stirling
353d311c1e Apply suggestions from code review of branch no-uvicorn.error-logs-without-error
Co-authored-by: Richard Bowman <richard.bowman@cantab.net>
2025-08-27 13:24:37 +00:00
Julian Stirling
7f7809de9d Update BaseModels to use ConfigDict rather than directly use a dictionary 2025-08-26 16:12:41 +01:00
Julian Stirling
c31fffad5b Make simulation image wrap to prevent errors when moving out of range. 2025-08-26 16:03:56 +01:00
Julian Stirling
2d89cdd3a3 Add tests for the legacy api 2025-08-24 20:45:55 +01:00
Julian Stirling
9257c4489e Apply suggestions from code review of branch prevent-broken-frames-ending-scans
Co-authored-by: Beth Probert <beth_probert@outlook.com>
2025-08-21 18:05:46 +01:00
Julian Stirling
dade26cde1 Tweak a few error types. 2025-08-21 16:11:30 +01:00
Julian Stirling
95969c5daa Improve typehinting for logging 2025-08-21 15:49:00 +01:00
Julian Stirling
3529c96ec6 Stop reporting uvicorn.error in log file unless log it is an error 2025-08-21 15:40:27 +01:00
Julian Stirling
6fa4e4dc64 Add a grab_as_array camera method that grabs from the stream but catches broken jpegs and retries 2025-08-21 13:35:21 +01:00
Julian Stirling
0a9b6be9bd Raise error if tuning algorithm cannot be returned, unless explicityly asked not to 2025-08-21 12:44:57 +01:00
Julian Stirling
fdae0b9226 Add get_tuning_algo method to StreamingPiCamera2 2025-08-20 14:53:53 +01:00
Julian Stirling
ab0bece70b Deepcopy default tuning file so it isn't affected by calibration. 2025-08-20 14:51:19 +01:00
jaknapper
85e10189be Restore behaviour that uses nearest focused pos if adjacent fails 2025-08-19 14:54:38 +01:00
jaknapper
501fe3f9d2 Switch to neighbour cutoff based on dx and dy 2025-08-19 14:07:30 +01:00
jaknapper
422e63ea90 Increase neighbour ratio to 1.6 2025-08-15 18:56:26 +01:00
Joe Knapper
99652eca41 Merge branch 'log-oom-error' into 'v3'
Custom sigkill error

See merge request openflexure/openflexure-microscope-server!351
2025-08-15 12:13:25 +00:00
Julian Stirling
46802db308 Merge branch 'check-static-files' into 'v3'
Check static files exist or throw a useful error

See merge request openflexure/openflexure-microscope-server!368
2025-08-15 11:22:41 +00:00
Joe Knapper
c2980dc988 Merge branch 'typehint-autofocus' into 'v3'
Typehints and better variable names for autofocus

Closes #271

See merge request openflexure/openflexure-microscope-server!367
2025-08-15 10:30:36 +00:00
Joe Knapper
f383365cf7 Apply suggestions from code review of branch typehint-autofocus
Co-authored-by: Julian Stirling <julian@julianstirling.co.uk>
2025-08-15 10:30:29 +00:00
Joe Knapper
7b2a4cc3f6 Merge branch 'camera-deps' into 'v3'
Change all CameraDeps to CameraClients

Closes #483

See merge request openflexure/openflexure-microscope-server!366
2025-08-15 10:16:36 +00:00
Joe Knapper
bd115e0023 Change all CameraDeps to CameraClients 2025-08-15 10:16:36 +00:00
Julian Stirling
3289221c6b Add unit tests for all of serving static files. Update docs in src to clarify behaviour 2025-08-15 11:01:43 +01:00