|
4 | 4 | from pathlib import Path |
5 | 5 | from typing import Union |
6 | 6 |
|
7 | | -from bluesky.callbacks.zmq import Proxy, RemoteDispatcher, ServerCurve, ClientCurve |
| 7 | +from bluesky.callbacks.zmq import ClientCurve, Proxy, RemoteDispatcher, ServerCurve |
8 | 8 |
|
9 | 9 | logger = logging.getLogger("bluesky") |
10 | 10 |
|
@@ -103,27 +103,31 @@ def main(): |
103 | 103 | # Server mode - check for client mode flags |
104 | 104 | if args.in_client_secret or args.in_server_public: |
105 | 105 | raise ValueError( |
106 | | - "Cannot use client CURVE options (--in-client-secret, --in-server-public) when input is in bind mode" |
| 106 | + "Cannot use client CURVE options (--in-client-secret, --in-server-public) when " |
| 107 | + + "input is in bind mode" |
107 | 108 | ) |
108 | 109 | else: |
109 | 110 | # Client mode - check for server mode flags |
110 | 111 | if args.in_curve_secret or args.in_curve_client_keys or args.in_curve_allow: |
111 | 112 | raise ValueError( |
112 | | - "Cannot use server CURVE options (--in-curve-secret, --in-curve-client-keys, --in-curve-allow) when input is in connect mode" |
| 113 | + "Cannot use server CURVE options (--in-curve-secret, --in-curve-client-keys, --in-curve-allow) " |
| 114 | + + "when input is in connect mode" |
113 | 115 | ) |
114 | 116 |
|
115 | 117 | # Validate CURVE configuration consistency for output |
116 | 118 | if out_bind: |
117 | 119 | # Server mode - check for client mode flags |
118 | 120 | if args.out_client_secret or args.out_server_public: |
119 | 121 | raise ValueError( |
120 | | - "Cannot use client CURVE options (--out-client-secret, --out-server-public) when output is in bind mode" |
| 122 | + "Cannot use client CURVE options (--out-client-secret, --out-server-public) " |
| 123 | + + "when output is in bind mode" |
121 | 124 | ) |
122 | 125 | else: |
123 | 126 | # Client mode - check for server mode flags |
124 | 127 | if args.out_curve_secret or args.out_curve_client_keys or args.out_curve_allow: |
125 | 128 | raise ValueError( |
126 | | - "Cannot use server CURVE options (--out-curve-secret, --out-curve-client-keys, --out-curve-allow) when output is in connect mode" |
| 129 | + "Cannot use server CURVE options (--out-curve-secret, --out-curve-client-keys, --out-curve-allow) " |
| 130 | + + "when output is in connect mode" |
127 | 131 | ) |
128 | 132 |
|
129 | 133 | # Helper to build ServerCurve or None |
@@ -160,8 +164,8 @@ def build_client_curve(secret: Union[str, None], server_public: Union[str, None] |
160 | 164 |
|
161 | 165 | # Configure logging BEFORE creating the proxy so we capture socket configuration debug messages |
162 | 166 | if args.verbose: |
163 | | - from bluesky.log import config_bluesky_logging |
164 | 167 | import bluesky.log |
| 168 | + from bluesky.log import config_bluesky_logging |
165 | 169 |
|
166 | 170 | # "INFO" if called with '-v' or '-vv', "DEBUG" if called with '-vvv' |
167 | 171 | level = "INFO" if args.verbose <= 2 else "DEBUG" |
|
0 commit comments