rahix/openflexure-microscope-server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2401 commits 1 branch 0 tags 24 MiB
Commit graph

2401 commits

This branch
This branch
All branches
Author SHA1 Message Date
Richard
ec992c083f Describe filename param in capture download 2021-07-19 21:40:28 +01:00
Richard
36be07b276 Responses and parameters for zipbuilder 2021-07-19 21:32:08 +01:00
Richard
ba0f78df84 fix typing in autofocus 
I have an Optional dz, which is then
populated with a default if it's None.
I've added an explicit cast() to explain this to mypy.
 2021-07-19 21:18:25 +01:00
Richard
72f3c11fdd linting and typing fixes 2021-07-19 20:29:13 +01:00
Richard
b7c9d3b73b Sorted remaining content_type issues and blackened 2021-07-19 20:09:09 +01:00
Richard
38fbe530d2 Fix externalDocs entries 
My externalDocs entries in the "tags" metadata section
of the OpenAPI description were not valid.
This is now fixed.
 2021-07-19 11:56:40 +01:00
Richard Bowman
8eba9d7981 Build and validate OpenAPI YAML description in CI 2021-07-19 10:51:42 +00:00
Richard
077d6fdc4b Added OpenAPI validation from apispec 2021-07-19 11:50:50 +01:00
Richard
6a7c305468 Started adding more content to openapi 2021-07-14 19:15:26 +01:00
Richard
8422e8bfef ignore local installation of swagger-cli 2021-07-13 22:54:11 +01:00
Richard
48fa1842a9 Fixed stage schemas 
If missing=None, we need to specify allow_None=False
in order to generate valid OpenAPI.
This may also be fixed by an upstream change in LabThings.

Also, OneOf was being used incorrectly in StageTypeProperty.
 2021-07-13 22:53:35 +01:00
Richard
50ad9d4369 Fixed content dicts to be valid OpenAPI 
For functions that return JPEGs, we were
 using "content_type": "image/jpeg"
 instead we should use "content": { "image/jpeg": {}}
 2021-07-13 22:52:10 +01:00
Richard
9892c7079a moved find_microscope into functions 2021-07-13 22:50:42 +01:00
Richard
65f5a69bad fix openapi response in docs 2021-07-13 22:49:06 +01:00
Richard
19abfff061 Add HTTP API to docs 2021-07-06 15:26:27 +01:00
Richard
00531a93bf Fixed response descriptions for stream/RAM capture 2021-07-06 15:24:43 +01:00
Richard
c81c4eb64d Better API docs for autofocus extension 2021-07-06 15:24:17 +01:00
Richard
202d942c90 Add entry point to generate OpenAPI yaml/json 
This is designed to be used as a console entry point so we can generate
the OpenAPI description without starting the server.
 2021-07-06 15:23:42 +01:00
Richard
1e21ce51fc Some basic validation for OpenAPI 
I was getting unhelpful OpenAPI errors, this Python script makes it easier
to figure out where they come from.
 2021-07-06 15:18:53 +01:00
Richard
8157fa6d58 Add YAML export from APISpec 2021-06-27 21:08:48 +01:00
Richard Bowman
5279becce7 Merge branch 'remember-scan-parameters' into 'master' 
Scan settings are now remembered

Closes #216

See merge request openflexure/openflexure-microscope-server!132
 2021-06-22 11:21:20 +00:00
Richard
3921f5de76 Remove commented-out code 2021-06-22 10:57:48 +01:00
Richard Bowman
826b81f3bf Merge branch 'use-pipenv-deploy-in-ci' into 'master' 
add --deploy flag to pipenv install

Closes #227

See merge request openflexure/openflexure-microscope-server!131
 2021-06-22 09:55:37 +00:00
Richard
03cb019864 Don't remember the "scanCapture" setting 
Given that it changes the "capture" button from
single image acquisition to a long running scan,
I think it's less confusing if the "scan capture" setting
is not remembered across page refreshes.
 2021-06-03 16:21:03 +01:00
Richard
318c4088dd Auto-open scan section if enabled 
Saving default to local storage has a problem:
if you have ticked "scan", the section is not
visible by default so it's easy to start a scan
by accident.  I've now forced it to be open if
the scanCapture checkbox is true.
 2021-06-03 16:16:00 +01:00
Richard
31faaaf161 Whitespace linting fixes 2021-06-03 16:10:03 +01:00
Richard
178d6fb84b Fix ame of CaptureContent 2021-06-03 16:09:51 +01:00
Richard
8afa503867 Scan settings are now remembered 
This is done in local storage, and I'm
quite pleased with how neat it is!
Happy to be corrected on a better way to pass `this` though!
 2021-06-03 16:09:40 +01:00
Richard
3573c64b94 add --deploy flag to pipenv install 2021-06-03 14:38:22 +01:00
Richard Bowman
48ff706472 Merge branch 'version-bump' into 'master' 
Version bump

See merge request openflexure/openflexure-microscope-server!130
 2021-05-25 16:20:46 +00:00
Richard
4ca51d9ba9 Version bump 2021-05-25 17:03:02 +01:00
Richard Bowman
11876b070d Merge branch 'fix-dependencies' into 'master' 
Re-locked dependencies

Closes #225

See merge request openflexure/openflexure-microscope-server!129
 2021-05-25 14:48:35 +00:00
Richard Bowman
9c5d040d82 Re-locked dependencies 2021-05-25 11:28:46 +01:00
Kaspar Emanuel
90d5c35cdb Merge branch 'v2.10.0b0-release' into 'master' 
Updated changelog for beta release

See merge request openflexure/openflexure-microscope-server!128
 2021-05-25 10:20:40 +00:00
Richard Bowman
ba95b25800 Updated changelog for beta release 2021-05-25 10:20:40 +00:00
Richard Bowman
de28b0e2f6 Merge branch 'improve-local-development' into 'master' 
Local development improvements

See merge request openflexure/openflexure-microscope-server!125
 2021-05-18 10:56:10 +00:00
Richard Bowman
4d405443bb Merge branch 'scan-shape-limits' into 'master' 
Add minimum scan dimension

See merge request openflexure/openflexure-microscope-server!123
 2021-05-18 10:55:06 +00:00
Richard
f2a4b976b9 Fix whitespace 2021-05-13 10:43:50 +01:00
Richard
126766aa06 Removed unnecessary package 
I'm not using vuex-map-fields, so have
removed it.
 2021-05-05 16:44:25 +01:00
Richard
0bdb5b4721 Actually save stream settings to local storage 
After some refactoring, I lost the code that actually
saved stream settings to local storage.
This commit restores that functionality.
 2021-05-05 16:19:43 +01:00
Richard Bowman
09d2cbfdef Merge branch 'fix-camera-stage-mapping-matrix' into 'master' 
Fix handling of missing CSM matrix

See merge request openflexure/openflexure-microscope-server!127
 2021-05-05 09:57:28 +00:00
Richard
0c6e6caade Improve errors with better exception 
I've swapped the ValueError for a RuntimeError subclass to
make it clearer what's gone wrong.
 2021-05-05 10:05:47 +01:00
Richard Bowman
14c4908a98 fix linter error 2021-05-04 13:41:39 +01:00
Richard Bowman
6e7adb66cd Fix handling of missing CSM matrix 
The code checks for the camera-stage mapper matrix by looking at its truth value.
However, this is ambiguous because the matrix has many elements.  That means that
if it's missing, we get the expected result, but if it's present
we get an error.

I have avoided dict.get() and instead look it up with [] notation.
This will raise a KeyError if it's missing, which I
handle helpfully.
If the key is present but the value is not castable to an array, we'll
get an exception anyway.
 2021-04-28 22:29:56 +01:00
Richard Bowman
7028ac66bb Merge branch 'auto-exposure-gain-awb' into 'master' 
Fix auto-exposure and AWB

Closes #191

See merge request openflexure/openflexure-microscope-server!119
 2021-04-28 07:57:56 +00:00
Richard Bowman
82eba1e99a fixed typing error 2021-04-27 20:17:07 +01:00
Richard Bowman
87f636ecc0 Code format and linting 2021-04-27 19:56:54 +01:00
Richard Bowman
bb303d4766 Simplified auto gain/exposure algorithm 
adjust_shutter_and_gain_from_raw now uses a simpler algorithm.
The code is longer overall but hides some details in fuctions.
I've also split the loop into one for shutter speed and one for gain.
This isn't the algorithm that I originally wrote, but it seems to
work and is more readable.
 2021-04-27 18:54:21 +01:00
Richard Bowman
42f00b69a4 Merge remote-tracking branch 'origin/master' into auto-exposure-gain-awb 
This was primarily done to disable the warning about f strings in
logging statements, globally rather than per-file.
 2021-04-27 17:16:19 +01:00
Richard Bowman
79b0d48cf4 Swap Generator annotation for Iterator 2021-04-27 17:13:40 +01:00