Skip to content

Commit d6ce6bb

Browse files
committed
Version 6.2.1 bump
1 parent 1195766 commit d6ce6bb

File tree

97 files changed

+7340
-4257
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

97 files changed

+7340
-4257
lines changed

.github/workflows/pypi-publish.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,4 +28,4 @@ jobs:
2828
uses: pypa/gh-action-pypi-publish@master
2929
with:
3030
user: __token__
31-
password: ${{ secrets.PYPI_API_TOKEN }}
31+
password: ${{ secrets.PYPI_API_TOKEN }}

BREAKING_CHANGES_IN_5.0.md

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ The 5.0 release of MinKNOW API, describing the API for MinKNOW Core 5.0, has sev
44
changes from earlier 4.x versions, and code using the API will need to be updated to suit.
55

66
The breaking changes are documented below. There also some changes to the API that do not
7-
break compatibility with older versions, such as the addition of new RPC's; these are not
7+
break compatibility with older versions, such as the addition of new RPC's; these are not
88
documented here.
99

1010

@@ -18,43 +18,43 @@ No RPCs have been removed from the MinKNOW API since MinKNOW Core 4.0.
1818
Note that some messages have had their fields renumbered. The wire format of these messages will
1919
not be compatible with earlier 4.x versions.
2020

21-
Some messages have had fields renamed, but using the same number as in 4.x. These messages will
21+
Some messages have had fields renamed, but using the same number as in 4.x. These messages will
2222
be wire compatible with 4.x, although the interpretation of these fields may have changed. Code
2323
which uses these renamed fields will not be compatible.
2424

2525
The following messages have had their fields changed:
2626

2727
### `analysis_configuration.proto`
2828

29-
* `ReportConfiguration.ReportConfiguration`: The `markdown_report_file_pattern` field has been
29+
* `ReportConfiguration.ReportConfiguration`: The `markdown_report_file_pattern` field has been
3030
renumbered to 8. Field number 2 is now `json_report_file_pattern`
31-
31+
3232
### `instance.proto`
3333

34-
* `GetVersionInfoResponse`: The `protocols` field has been renamed to `bream`, and the
34+
* `GetVersionInfoResponse`: The `protocols` field has been renamed to `bream`, and the
3535
`configuration` field renamed to `protocol_configuration`, to more accurately reflect
3636
the contents of the packages these fields relate to.
37-
37+
3838
### `keystore.proto`
3939

4040
* `StoreRequest`: When using the `lifetime` field to store a value in the manager, the only valid
4141
values are `UNTIL_INSTANCE_END` and `PERSIST_ACROSS_RESTARTS`. Using any other value will cause
42-
the call to fail with `INVALID_ARGUMENT`
42+
the call to fail with `INVALID_ARGUMENT`
4343

4444
### `manager.proto`
4545

46-
* `FlowCellPosition.RpcPorts`: The fields `insecure` and `insecure_grpc_web` have been removed,
46+
* `FlowCellPosition.RpcPorts`: The fields `insecure` and `insecure_grpc_web` have been removed,
4747
as it is no longer possible to use the gRPC protocols without TLS.
4848

4949
### `statistics.proto`
5050

51-
* `AcquisitionOutputBucket` has been renamed to `AcquisitionOutputSnapshot`, as this message
51+
* `AcquisitionOutputBucket` has been renamed to `AcquisitionOutputSnapshot`, as this message
5252
really reflects a snapshot of data at a given time point. The field `bucket` has been renamed
53-
to `seconds`, as it indicates the time point.
53+
to `seconds`, as it indicates the time point.
5454
* `StreamAcquisitionOutputResponse`: The submessage `FilteredBuckets` has been
5555
renamed to `FilteredSnapshots`. The `buckets` field in both messages has been renamed
5656
to `snapshots`.
57-
* `WriterOutputBucket` has been renamed to `WriterOutputSnapshot`, as this message
57+
* `WriterOutputBucket` has been renamed to `WriterOutputSnapshot`, as this message
5858
really reflects a snapshot of data at a given time point. The field `bucket` has been renamed
59-
to `seconds`, as it indicates the time point.
59+
to `seconds`, as it indicates the time point.
6060
* `StreamWriterOutputResponse`: The `buckets` field has been renamed to `snapshots`.

BUILD.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
Building the python client
22
==========================
33

4-
The Python code has already been pre-generated from the .proto files, so to install it
4+
The Python code has already been pre-generated from the .proto files, so to install it
55
just run:
66

77
```bash
88
cd python
99
python -m pip install .
10-
```
10+
```

LICENSE.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,4 +360,3 @@ You may add additional accurate notices of copyright ownership.
360360

361361
This Source Code Form is "Incompatible With Secondary Licenses", as
362362
defined by the Mozilla Public License, v. 2.0.
363-

README.md

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ including gathering information about running or finished experiments, starting
1818
experiments, and even exerting more fine-grained control. Anything that can be done via MinKNOW's
1919
user interface (and more) can be done using the APIs in this project.
2020

21-
This project is targetted at LIMS developers or developers of other tools that have a need to
21+
This project is targeted at LIMS developers or developers of other tools that have a need to
2222
integrate with MinKNOW. Some familiarity with Python is expected (although the APIs can be used from
2323
other languages), as the examples are written in Python. If you are not familiar with [gRPC][grpc],
2424
it is worth reading through some of the [gRPC documentation][grpc-docs] to get a feel for it.

dev-requirements.txt

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
1-
cryptography~=39.0
2-
grpcio==1.60.0
3-
grpcio-tools==1.60.0
1+
cryptography~=42.0
2+
grpcio==1.60.1
3+
grpcio-tools==1.60.1
44
minknow-api-service-plugin
55
pre-commit
66
pytest

proto/minknow_api/acquisition.proto

Lines changed: 33 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -107,6 +107,13 @@ service AcquisitionService {
107107
option idempotency_level = IDEMPOTENT;
108108
}
109109

110+
// Find the signal reader in use. This may have been configured by MinKNOW prior to a protocol being begun.
111+
//
112+
// Since 6.2
113+
rpc get_signal_reader (GetSignalReaderRequest) returns (GetSignalReaderResponse) {
114+
option idempotency_level = IDEMPOTENT;
115+
}
116+
110117
// Set the bream information for the current acquisition.
111118
//
112119
// This should only be called by the protocol. It will only affect the last acquisition that was
@@ -401,6 +408,10 @@ enum AcquisitionState {
401408
// The acquisition period finished on its own and
402409
// did not report an error.
403410
ACQUISITION_COMPLETED = 3;
411+
412+
// The acquisition period is paused.
413+
// that is, no data transfer occurring.
414+
ACQUISITION_PAUSED = 4;
404415
}
405416

406417
enum AcquisitionStopReason {
@@ -452,10 +463,10 @@ enum StartupState {
452463
// Setting up data writers for outputting reads/files.
453464
STARTUP_INITIALISING_DATA_WRITERS = 5;
454465

455-
// Initialsing storage for in flight reads.
466+
// Initialising storage for in flight reads.
456467
STARTUP_INITIALISING_INTERMEDIATE_DATA_STORAGE = 6;
457468

458-
// Initialsing storage for run statistics.
469+
// Initialising storage for run statistics.
459470
STARTUP_INITIALISING_STATISTICS = 7;
460471
}
461472

@@ -530,7 +541,7 @@ message AcquisitionYieldSummary
530541
// As above, but counted in bases rather than basecalls.
531542
TotalsPerDuplexCategory basecalled_pass_bases_split = 24;
532543
TotalsPerDuplexCategory basecalled_fail_bases_split = 25;
533-
544+
534545
// Number of raw samples which have been called.
535546
int64 basecalled_samples = 6;
536547

@@ -709,7 +720,7 @@ message AcquisitionConfigSummary {
709720
bool fastq_reads_enabled = 5;
710721
// Determine if pod5 reads were enabled for the run.
711722
bool pod5_reads_enabled = 22;
712-
723+
713724
// This field has been removed
714725
// Since 5.8
715726
reserved 6;
@@ -929,7 +940,7 @@ message AcquisitionRunInfo {
929940
// Set information provided by the Bream toolkit.
930941
BreamInfo bream_info = 15;
931942

932-
// Target Run-Until Critiera, used to determine when the acquisition should be paused
943+
// Target Run-Until Criteria, used to determine when the acquisition should be paused
933944
// or stopped.
934945
//
935946
// Since 5.3
@@ -954,7 +965,10 @@ message SetSignalReaderRequest {
954965

955966
// Available signal reader types
956967
enum SignalReaderType {
968+
option allow_alias = true;
969+
957970
HDF5 = 0; // Default value
971+
PLAYBACK = 0; // Renamed default value - playback can handle non-hdf file formats too.
958972
DEVICE = 1;
959973
}
960974

@@ -977,6 +991,20 @@ message SetSignalReaderRequest {
977991

978992
message SetSignalReaderResponse {}
979993

994+
message GetSignalReaderRequest {}
995+
message GetSignalReaderResponse {
996+
// The type of signal reader to use
997+
SetSignalReaderRequest.SignalReaderType reader = 1 [(rpc_required) = true];
998+
999+
// The following is only set if the signal reader is a playback source.
1000+
string playback_source = 2;
1001+
1002+
SetSignalReaderRequest.SourceFileMode playback_mode = 3;
1003+
1004+
float sample_rate_scale_factor = 4;
1005+
}
1006+
1007+
9801008
message SetBreamInfoRequest {
9811009
// The information to set.
9821010
//

0 commit comments

Comments
 (0)