ese774-frame 0.6.1__tar.gz
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- ese774_frame-0.6.1/LICENSE +201 -0
- ese774_frame-0.6.1/PKG-INFO +407 -0
- ese774_frame-0.6.1/README.md +386 -0
- ese774_frame-0.6.1/pyproject.toml +45 -0
- ese774_frame-0.6.1/setup.cfg +4 -0
- ese774_frame-0.6.1/src/ese774_frame/__init__.py +15 -0
- ese774_frame-0.6.1/src/ese774_frame/adapter.py +418 -0
- ese774_frame-0.6.1/src/ese774_frame/api_server.py +211 -0
- ese774_frame-0.6.1/src/ese774_frame/clients/__init__.py +11 -0
- ese774_frame-0.6.1/src/ese774_frame/clients/async_device_client.py +472 -0
- ese774_frame-0.6.1/src/ese774_frame/clients/device_proxy.py +144 -0
- ese774_frame-0.6.1/src/ese774_frame/clients/make_pyi_device_client.py +600 -0
- ese774_frame-0.6.1/src/ese774_frame/clients/make_pyi_device_proxy.py +100 -0
- ese774_frame-0.6.1/src/ese774_frame/clients/sync_device_client.py +461 -0
- ese774_frame-0.6.1/src/ese774_frame/models/__init__.py +0 -0
- ese774_frame-0.6.1/src/ese774_frame/models/api_spec.py +133 -0
- ese774_frame-0.6.1/src/ese774_frame/routers/__init__.py +2 -0
- ese774_frame-0.6.1/src/ese774_frame/routers/device_router.py +897 -0
- ese774_frame-0.6.1/src/ese774_frame/routers/make_pyi_device_router.py +139 -0
- ese774_frame-0.6.1/src/ese774_frame.egg-info/PKG-INFO +407 -0
- ese774_frame-0.6.1/src/ese774_frame.egg-info/SOURCES.txt +22 -0
- ese774_frame-0.6.1/src/ese774_frame.egg-info/dependency_links.txt +1 -0
- ese774_frame-0.6.1/src/ese774_frame.egg-info/requires.txt +11 -0
- ese774_frame-0.6.1/src/ese774_frame.egg-info/top_level.txt +1 -0
|
@@ -0,0 +1,201 @@
|
|
|
1
|
+
Apache License
|
|
2
|
+
Version 2.0, January 2004
|
|
3
|
+
http://www.apache.org/licenses/
|
|
4
|
+
|
|
5
|
+
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
|
6
|
+
|
|
7
|
+
1. Definitions.
|
|
8
|
+
|
|
9
|
+
"License" shall mean the terms and conditions for use, reproduction,
|
|
10
|
+
and distribution as defined by Sections 1 through 9 of this document.
|
|
11
|
+
|
|
12
|
+
"Licensor" shall mean the copyright owner or entity authorized by
|
|
13
|
+
the copyright owner that is granting the License.
|
|
14
|
+
|
|
15
|
+
"Legal Entity" shall mean the union of the acting entity and all
|
|
16
|
+
other entities that control, are controlled by, or are under common
|
|
17
|
+
control with that entity. For the purposes of this definition,
|
|
18
|
+
"control" means (i) the power, direct or indirect, to cause the
|
|
19
|
+
direction or management of such entity, whether by contract or
|
|
20
|
+
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
|
21
|
+
outstanding shares, or (iii) beneficial ownership of such entity.
|
|
22
|
+
|
|
23
|
+
"You" (or "Your") shall mean an individual or Legal Entity
|
|
24
|
+
exercising permissions granted by this License.
|
|
25
|
+
|
|
26
|
+
"Source" form shall mean the preferred form for making modifications,
|
|
27
|
+
including but not limited to software source code, documentation
|
|
28
|
+
source, and configuration files.
|
|
29
|
+
|
|
30
|
+
"Object" form shall mean any form resulting from mechanical
|
|
31
|
+
transformation or translation of a Source form, including but
|
|
32
|
+
not limited to compiled object code, generated documentation,
|
|
33
|
+
and conversions to other media types.
|
|
34
|
+
|
|
35
|
+
"Work" shall mean the work of authorship, whether in Source or
|
|
36
|
+
Object form, made available under the License, as indicated by a
|
|
37
|
+
copyright notice that is included in or attached to the work
|
|
38
|
+
(an example is provided in the Appendix below).
|
|
39
|
+
|
|
40
|
+
"Derivative Works" shall mean any work, whether in Source or Object
|
|
41
|
+
form, that is based on (or derived from) the Work and for which the
|
|
42
|
+
editorial revisions, annotations, elaborations, or other modifications
|
|
43
|
+
represent, as a whole, an original work of authorship. For the purposes
|
|
44
|
+
of this License, Derivative Works shall not include works that remain
|
|
45
|
+
separable from, or merely link (or bind by name) to the interfaces of,
|
|
46
|
+
the Work and Derivative Works thereof.
|
|
47
|
+
|
|
48
|
+
"Contribution" shall mean any work of authorship, including
|
|
49
|
+
the original version of the Work and any modifications or additions
|
|
50
|
+
to that Work or Derivative Works thereof, that is intentionally
|
|
51
|
+
submitted to Licensor for inclusion in the Work by the copyright owner
|
|
52
|
+
or by an individual or Legal Entity authorized to submit on behalf of
|
|
53
|
+
the copyright owner. For the purposes of this definition, "submitted"
|
|
54
|
+
means any form of electronic, verbal, or written communication sent
|
|
55
|
+
to the Licensor or its representatives, including but not limited to
|
|
56
|
+
communication on electronic mailing lists, source code control systems,
|
|
57
|
+
and issue tracking systems that are managed by, or on behalf of, the
|
|
58
|
+
Licensor for the purpose of discussing and improving the Work, but
|
|
59
|
+
excluding communication that is conspicuously marked or otherwise
|
|
60
|
+
designated in writing by the copyright owner as "Not a Contribution."
|
|
61
|
+
|
|
62
|
+
"Contributor" shall mean Licensor and any individual or Legal Entity
|
|
63
|
+
on behalf of whom a Contribution has been received by Licensor and
|
|
64
|
+
subsequently incorporated within the Work.
|
|
65
|
+
|
|
66
|
+
2. Grant of Copyright License. Subject to the terms and conditions of
|
|
67
|
+
this License, each Contributor hereby grants to You a perpetual,
|
|
68
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
69
|
+
copyright license to reproduce, prepare Derivative Works of,
|
|
70
|
+
publicly display, publicly perform, sublicense, and distribute the
|
|
71
|
+
Work and such Derivative Works in Source or Object form.
|
|
72
|
+
|
|
73
|
+
3. Grant of Patent License. Subject to the terms and conditions of
|
|
74
|
+
this License, each Contributor hereby grants to You a perpetual,
|
|
75
|
+
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
|
76
|
+
(except as stated in this section) patent license to make, have made,
|
|
77
|
+
use, offer to sell, sell, import, and otherwise transfer the Work,
|
|
78
|
+
where such license applies only to those patent claims licensable
|
|
79
|
+
by such Contributor that are necessarily infringed by their
|
|
80
|
+
Contribution(s) alone or by combination of their Contribution(s)
|
|
81
|
+
with the Work to which such Contribution(s) was submitted. If You
|
|
82
|
+
institute patent litigation against any entity (including a
|
|
83
|
+
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
|
84
|
+
or a Contribution incorporated within the Work constitutes direct
|
|
85
|
+
or contributory patent infringement, then any patent licenses
|
|
86
|
+
granted to You under this License for that Work shall terminate
|
|
87
|
+
as of the date such litigation is filed.
|
|
88
|
+
|
|
89
|
+
4. Redistribution. You may reproduce and distribute copies of the
|
|
90
|
+
Work or Derivative Works thereof in any medium, with or without
|
|
91
|
+
modifications, and in Source or Object form, provided that You
|
|
92
|
+
meet the following conditions:
|
|
93
|
+
|
|
94
|
+
(a) You must give any other recipients of the Work or
|
|
95
|
+
Derivative Works a copy of this License; and
|
|
96
|
+
|
|
97
|
+
(b) You must cause any modified files to carry prominent notices
|
|
98
|
+
stating that You changed the files; and
|
|
99
|
+
|
|
100
|
+
(c) You must retain, in the Source form of any Derivative Works
|
|
101
|
+
that You distribute, all copyright, patent, trademark, and
|
|
102
|
+
attribution notices from the Source form of the Work,
|
|
103
|
+
excluding those notices that do not pertain to any part of
|
|
104
|
+
the Derivative Works; and
|
|
105
|
+
|
|
106
|
+
(d) If the Work includes a "NOTICE" text file as part of its
|
|
107
|
+
distribution, then any Derivative Works that You distribute must
|
|
108
|
+
include a readable copy of the attribution notices contained
|
|
109
|
+
within such NOTICE file, excluding those notices that do not
|
|
110
|
+
pertain to any part of the Derivative Works, in at least one
|
|
111
|
+
of the following places: within a NOTICE text file distributed
|
|
112
|
+
as part of the Derivative Works; within the Source form or
|
|
113
|
+
documentation, if provided along with the Derivative Works; or,
|
|
114
|
+
within a display generated by the Derivative Works, if and
|
|
115
|
+
wherever such third-party notices normally appear. The contents
|
|
116
|
+
of the NOTICE file are for informational purposes only and
|
|
117
|
+
do not modify the License. You may add Your own attribution
|
|
118
|
+
notices within Derivative Works that You distribute, alongside
|
|
119
|
+
or as an addendum to the NOTICE text from the Work, provided
|
|
120
|
+
that such additional attribution notices cannot be construed
|
|
121
|
+
as modifying the License.
|
|
122
|
+
|
|
123
|
+
You may add Your own copyright statement to Your modifications and
|
|
124
|
+
may provide additional or different license terms and conditions
|
|
125
|
+
for use, reproduction, or distribution of Your modifications, or
|
|
126
|
+
for any such Derivative Works as a whole, provided Your use,
|
|
127
|
+
reproduction, and distribution of the Work otherwise complies with
|
|
128
|
+
the conditions stated in this License.
|
|
129
|
+
|
|
130
|
+
5. Submission of Contributions. Unless You explicitly state otherwise,
|
|
131
|
+
any Contribution intentionally submitted for inclusion in the Work
|
|
132
|
+
by You to the Licensor shall be under the terms and conditions of
|
|
133
|
+
this License, without any additional terms or conditions.
|
|
134
|
+
Notwithstanding the above, nothing herein shall supersede or modify
|
|
135
|
+
the terms of any separate license agreement you may have executed
|
|
136
|
+
with Licensor regarding such Contributions.
|
|
137
|
+
|
|
138
|
+
6. Trademarks. This License does not grant permission to use the trade
|
|
139
|
+
names, trademarks, service marks, or product names of the Licensor,
|
|
140
|
+
except as required for reasonable and customary use in describing the
|
|
141
|
+
origin of the Work and reproducing the content of the NOTICE file.
|
|
142
|
+
|
|
143
|
+
7. Disclaimer of Warranty. Unless required by applicable law or
|
|
144
|
+
agreed to in writing, Licensor provides the Work (and each
|
|
145
|
+
Contributor provides its Contributions) on an "AS IS" BASIS,
|
|
146
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
|
147
|
+
implied, including, without limitation, any warranties or conditions
|
|
148
|
+
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
|
149
|
+
PARTICULAR PURPOSE. You are solely responsible for determining the
|
|
150
|
+
appropriateness of using or redistributing the Work and assume any
|
|
151
|
+
risks associated with Your exercise of permissions under this License.
|
|
152
|
+
|
|
153
|
+
8. Limitation of Liability. In no event and under no legal theory,
|
|
154
|
+
whether in tort (including negligence), contract, or otherwise,
|
|
155
|
+
unless required by applicable law (such as deliberate and grossly
|
|
156
|
+
negligent acts) or agreed to in writing, shall any Contributor be
|
|
157
|
+
liable to You for damages, including any direct, indirect, special,
|
|
158
|
+
incidental, or consequential damages of any character arising as a
|
|
159
|
+
result of this License or out of the use or inability to use the
|
|
160
|
+
Work (including but not limited to damages for loss of goodwill,
|
|
161
|
+
work stoppage, computer failure or malfunction, or any and all
|
|
162
|
+
other commercial damages or losses), even if such Contributor
|
|
163
|
+
has been advised of the possibility of such damages.
|
|
164
|
+
|
|
165
|
+
9. Accepting Warranty or Additional Liability. While redistributing
|
|
166
|
+
the Work or Derivative Works thereof, You may choose to offer,
|
|
167
|
+
and charge a fee for, acceptance of support, warranty, indemnity,
|
|
168
|
+
or other liability obligations and/or rights consistent with this
|
|
169
|
+
License. However, in accepting such obligations, You may act only
|
|
170
|
+
on Your own behalf and on Your sole responsibility, not on behalf
|
|
171
|
+
of any other Contributor, and only if You agree to indemnify,
|
|
172
|
+
defend, and hold each Contributor harmless for any liability
|
|
173
|
+
incurred by, or claims asserted against, such Contributor by reason
|
|
174
|
+
of your accepting any such warranty or additional liability.
|
|
175
|
+
|
|
176
|
+
END OF TERMS AND CONDITIONS
|
|
177
|
+
|
|
178
|
+
APPENDIX: How to apply the Apache License to your work.
|
|
179
|
+
|
|
180
|
+
To apply the Apache License to your work, attach the following
|
|
181
|
+
boilerplate notice, with the fields enclosed by brackets "[]"
|
|
182
|
+
replaced with your own identifying information. (Don't include
|
|
183
|
+
the brackets!) The text should be enclosed in the appropriate
|
|
184
|
+
comment syntax for the file format. We also recommend that a
|
|
185
|
+
file or class name and description of purpose be included on the
|
|
186
|
+
same "printed page" as the copyright notice for easier
|
|
187
|
+
identification within third-party archives.
|
|
188
|
+
|
|
189
|
+
Copyright [yyyy] [name of copyright owner]
|
|
190
|
+
|
|
191
|
+
Licensed under the Apache License, Version 2.0 (the "License");
|
|
192
|
+
you may not use this file except in compliance with the License.
|
|
193
|
+
You may obtain a copy of the License at
|
|
194
|
+
|
|
195
|
+
http://www.apache.org/licenses/LICENSE-2.0
|
|
196
|
+
|
|
197
|
+
Unless required by applicable law or agreed to in writing, software
|
|
198
|
+
distributed under the License is distributed on an "AS IS" BASIS,
|
|
199
|
+
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
200
|
+
See the License for the specific language governing permissions and
|
|
201
|
+
limitations under the License.
|
|
@@ -0,0 +1,407 @@
|
|
|
1
|
+
Metadata-Version: 2.4
|
|
2
|
+
Name: ese774_frame
|
|
3
|
+
Version: 0.6.1
|
|
4
|
+
Summary: Ese774 Frame (FastAPI Frame)
|
|
5
|
+
Author-email: Kengo NAKADA <kengo.nakada@email.com>
|
|
6
|
+
Requires-Python: >=3.7
|
|
7
|
+
Description-Content-Type: text/markdown
|
|
8
|
+
License-File: LICENSE
|
|
9
|
+
Requires-Dist: xlogger-py
|
|
10
|
+
Requires-Dist: fastapi
|
|
11
|
+
Requires-Dist: pytango
|
|
12
|
+
Requires-Dist: uvicorn
|
|
13
|
+
Requires-Dist: pydantic
|
|
14
|
+
Requires-Dist: sphinx
|
|
15
|
+
Requires-Dist: myst-parser
|
|
16
|
+
Requires-Dist: sphinx-autobuild
|
|
17
|
+
Requires-Dist: sphinx-rtd-theme
|
|
18
|
+
Requires-Dist: sphinxcontrib-napoleon
|
|
19
|
+
Requires-Dist: linkify-it-py
|
|
20
|
+
Dynamic: license-file
|
|
21
|
+
|
|
22
|
+
# Ese774 Frame (FastAPI Frame)
|
|
23
|
+
|
|
24
|
+
[ohara-lab-su](https://ohara-lab-su.github.io/) / [ese774_frame (doc)](https://ohara-lab-su.github.io/ese774_frame/)
|
|
25
|
+
|
|
26
|
+
`ese774_frame` は、Python で実装された機器制御クラスを FastAPI / HTTP 経由で公開し、クライアント側から元の制御クラスに近いインターフェースで利用するための通信フレームである。
|
|
27
|
+
|
|
28
|
+
サーバーとクライアントの間では JSON/HTTP を使用する。機器固有の通信処理は制御クラス側に保持し、HTTP 通信、API 公開、property 転送、型復元、client/proxy、IDE 補完用 `.pyi` の生成をフレーム側で共通化する。
|
|
29
|
+
|
|
30
|
+
主な機能は以下のとおり。
|
|
31
|
+
|
|
32
|
+
- Python 制御クラスの public method / property の自動公開
|
|
33
|
+
- `api_spec=None` による自動 dispatch
|
|
34
|
+
- `dispatch_exclude` による自動公開対象からの除外
|
|
35
|
+
- 機器固有 Router と自動 dispatch の併用
|
|
36
|
+
- read-only / read-write property の透過アクセス
|
|
37
|
+
- 型アノテーションを利用した dataclass 等の戻り値型の復元
|
|
38
|
+
- Sync / Async client
|
|
39
|
+
- `DeviceProxy` による機器 client の生成
|
|
40
|
+
- client / router / `DeviceProxy` 用 `.pyi` の生成
|
|
41
|
+
- Pydantic + `ApiSpec` による明示 API 定義
|
|
42
|
+
- FastAPI / OpenAPI
|
|
43
|
+
|
|
44
|
+
## 基本構造
|
|
45
|
+
|
|
46
|
+
```text
|
|
47
|
+
Python device control class
|
|
48
|
+
|
|
|
49
|
+
v
|
|
50
|
+
FastApiServer
|
|
51
|
+
|
|
|
52
|
+
+-- DeviceRouter / device-specific Router
|
|
53
|
+
| |
|
|
54
|
+
| +-- automatic method dispatch
|
|
55
|
+
| +-- property transport
|
|
56
|
+
| +-- explicit ApiSpec routes
|
|
57
|
+
|
|
|
58
|
+
v
|
|
59
|
+
HTTP / JSON
|
|
60
|
+
|
|
|
61
|
+
v
|
|
62
|
+
SyncDeviceClient / AsyncDeviceClient
|
|
63
|
+
|
|
|
64
|
+
+-- Python method call
|
|
65
|
+
+-- Python property access
|
|
66
|
+
+-- return-type reconstruction
|
|
67
|
+
|
|
|
68
|
+
v
|
|
69
|
+
DeviceProxy / device package API
|
|
70
|
+
```
|
|
71
|
+
|
|
72
|
+
機器制御クラスは、ネットワーク通信を意識した wrapper に作り替える必要はない。通常の Python class として method、property、型アノテーションを定義し、フレームがその公開 API と通信境界を構成する。
|
|
73
|
+
|
|
74
|
+
## 自動 dispatch
|
|
75
|
+
|
|
76
|
+
`FastApiServer` に `api_spec=None` を渡すと、自動 dispatch が有効になる。
|
|
77
|
+
|
|
78
|
+
```python
|
|
79
|
+
from ese774_frame.api_server import FastApiServer
|
|
80
|
+
|
|
81
|
+
server = FastApiServer(
|
|
82
|
+
device_cls=SimpleCtrl,
|
|
83
|
+
router_cls=None,
|
|
84
|
+
config=None,
|
|
85
|
+
api_spec=None,
|
|
86
|
+
device_kwargs={"name": "simple"},
|
|
87
|
+
logger=logger,
|
|
88
|
+
logger_name="SimpleServer",
|
|
89
|
+
lifespan_msg_prefix="SIMPLE",
|
|
90
|
+
)
|
|
91
|
+
|
|
92
|
+
server.run(host="127.0.0.1", port=8000)
|
|
93
|
+
```
|
|
94
|
+
|
|
95
|
+
`router_cls=None` の場合はフレーム標準の `DeviceRouter` を使用する。`router_cls` を指定した場合は、その Router を使用しながら自動 dispatch を利用できる。
|
|
96
|
+
|
|
97
|
+
自動 dispatch では、制御クラスの public method と静的 property を公開対象とする。`_` で始まる名前は公開しない。
|
|
98
|
+
|
|
99
|
+
追加で公開対象から除外する API は `dispatch_exclude` で指定する。
|
|
100
|
+
|
|
101
|
+
```python
|
|
102
|
+
server = FastApiServer(
|
|
103
|
+
device_cls=SimpleCtrl,
|
|
104
|
+
router_cls=None,
|
|
105
|
+
config=None,
|
|
106
|
+
api_spec=None,
|
|
107
|
+
dispatch_exclude=["release", "internal_reset"],
|
|
108
|
+
)
|
|
109
|
+
```
|
|
110
|
+
|
|
111
|
+
## property
|
|
112
|
+
|
|
113
|
+
制御クラスに定義された `@property` または `property()` は、method dispatch とは別の property transport で扱う。
|
|
114
|
+
|
|
115
|
+
```python
|
|
116
|
+
class SimpleCtrl:
|
|
117
|
+
def __init__(self, name: str = "simple"):
|
|
118
|
+
self._name = name
|
|
119
|
+
|
|
120
|
+
@property
|
|
121
|
+
def name(self) -> str:
|
|
122
|
+
return self._name
|
|
123
|
+
|
|
124
|
+
@name.setter
|
|
125
|
+
def name(self, value: str) -> None:
|
|
126
|
+
self._name = value
|
|
127
|
+
```
|
|
128
|
+
|
|
129
|
+
Sync client では通常の Python property と同様にアクセスできる。
|
|
130
|
+
|
|
131
|
+
```python
|
|
132
|
+
print(client.name)
|
|
133
|
+
client.name = "device1"
|
|
134
|
+
```
|
|
135
|
+
|
|
136
|
+
setter を持たない property は read-only として扱う。`__getattr__` によって実行時に生成される動的属性は、静的 property の自動検出対象には含めない。
|
|
137
|
+
|
|
138
|
+
## 戻り値の型復元
|
|
139
|
+
|
|
140
|
+
自動 dispatch では、サーバー側 method の戻り値アノテーションを metadata として client に伝える。
|
|
141
|
+
|
|
142
|
+
dataclass は JSON 互換の値として転送し、client 側で型情報を用いて再構築する。
|
|
143
|
+
|
|
144
|
+
```python
|
|
145
|
+
from dataclasses import dataclass
|
|
146
|
+
from typing import Optional
|
|
147
|
+
|
|
148
|
+
|
|
149
|
+
@dataclass
|
|
150
|
+
class MotorStatus:
|
|
151
|
+
enabled: bool
|
|
152
|
+
speed: float
|
|
153
|
+
|
|
154
|
+
|
|
155
|
+
class MotorCtrl:
|
|
156
|
+
def get_status(self) -> Optional[MotorStatus]:
|
|
157
|
+
return MotorStatus(
|
|
158
|
+
enabled=True,
|
|
159
|
+
speed=10.0,
|
|
160
|
+
)
|
|
161
|
+
```
|
|
162
|
+
|
|
163
|
+
通信経路は JSON のまま維持される。
|
|
164
|
+
|
|
165
|
+
```text
|
|
166
|
+
MotorStatus
|
|
167
|
+
-> JSON-compatible dict
|
|
168
|
+
-> HTTP / JSON
|
|
169
|
+
-> dict
|
|
170
|
+
-> MotorStatus
|
|
171
|
+
```
|
|
172
|
+
|
|
173
|
+
型 descriptor は `Any`、`None`、通常の Python 型、dataclass、`Union` / `Optional`、`list`、`tuple`、`dict` を再帰的に扱う。
|
|
174
|
+
|
|
175
|
+
型情報を解決できない場合や dataclass の再構築に失敗した場合は、既存の JSON 値を保持する方向へフォールバックする。
|
|
176
|
+
|
|
177
|
+
## 機器固有 Router
|
|
178
|
+
|
|
179
|
+
自動 dispatch を使用しながら、一部の API だけを機器固有 Router で実装できる。
|
|
180
|
+
|
|
181
|
+
```python
|
|
182
|
+
from ese774_frame.routers.device_router import DeviceRouter
|
|
183
|
+
|
|
184
|
+
|
|
185
|
+
class SimpleRouter(DeviceRouter):
|
|
186
|
+
async def emergency_stop(self):
|
|
187
|
+
...
|
|
188
|
+
```
|
|
189
|
+
|
|
190
|
+
機器固有 Router に同名の method/property が定義されている場合は Router 側の実装を優先し、それ以外は制御クラスへの自動 dispatch にフォールバックする。
|
|
191
|
+
|
|
192
|
+
これにより、通常の API は制御クラスから自動公開し、HTTP 層で特別な処理が必要な API だけを Router に記述できる。
|
|
193
|
+
|
|
194
|
+
## Pydantic + ApiSpec
|
|
195
|
+
|
|
196
|
+
HTTP API を明示的に定義する場合は、Pydantic request model と `ApiSpec` を使用する。
|
|
197
|
+
|
|
198
|
+
```python
|
|
199
|
+
from pydantic import BaseModel
|
|
200
|
+
from ese774_frame.models.api_spec import ApiSpec
|
|
201
|
+
|
|
202
|
+
|
|
203
|
+
class AddRequest(BaseModel):
|
|
204
|
+
a: int
|
|
205
|
+
b: int
|
|
206
|
+
|
|
207
|
+
|
|
208
|
+
simple_api_spec = [
|
|
209
|
+
ApiSpec(
|
|
210
|
+
name="add",
|
|
211
|
+
object_name="simple",
|
|
212
|
+
request_model=AddRequest,
|
|
213
|
+
response_model=None,
|
|
214
|
+
method="post",
|
|
215
|
+
summary="add",
|
|
216
|
+
description="a + b",
|
|
217
|
+
),
|
|
218
|
+
]
|
|
219
|
+
```
|
|
220
|
+
|
|
221
|
+
property を `ApiSpec` で定義する場合は `kind="property"` を指定する。setter を許可する場合は `writable=True` とする。
|
|
222
|
+
|
|
223
|
+
```python
|
|
224
|
+
ApiSpec(
|
|
225
|
+
name="name",
|
|
226
|
+
object_name="simple",
|
|
227
|
+
request_model=None,
|
|
228
|
+
response_model=str,
|
|
229
|
+
kind="property",
|
|
230
|
+
writable=True,
|
|
231
|
+
)
|
|
232
|
+
```
|
|
233
|
+
|
|
234
|
+
`api_spec` を指定した場合、`FastApiServer` には `router_cls` が必要となる。
|
|
235
|
+
|
|
236
|
+
```python
|
|
237
|
+
server = FastApiServer(
|
|
238
|
+
device_cls=SimpleCtrl,
|
|
239
|
+
router_cls=DeviceRouter,
|
|
240
|
+
config=None,
|
|
241
|
+
api_spec=simple_api_spec,
|
|
242
|
+
)
|
|
243
|
+
```
|
|
244
|
+
|
|
245
|
+
## client
|
|
246
|
+
|
|
247
|
+
フレームは `SyncDeviceClient` と `AsyncDeviceClient` を提供する。
|
|
248
|
+
|
|
249
|
+
自動 dispatch では `api_spec=None` と `object_name` を指定する。
|
|
250
|
+
|
|
251
|
+
```python
|
|
252
|
+
from ese774_frame.clients import SyncDeviceClient
|
|
253
|
+
|
|
254
|
+
client = SyncDeviceClient(
|
|
255
|
+
server_host="127.0.0.1",
|
|
256
|
+
server_port=8000,
|
|
257
|
+
api_spec=None,
|
|
258
|
+
object_name="simple",
|
|
259
|
+
)
|
|
260
|
+
|
|
261
|
+
print(client.ping())
|
|
262
|
+
print(client.add(1, 2))
|
|
263
|
+
print(client.name)
|
|
264
|
+
```
|
|
265
|
+
|
|
266
|
+
Async client では method call を `await` する。
|
|
267
|
+
|
|
268
|
+
```python
|
|
269
|
+
from ese774_frame.clients import AsyncDeviceClient
|
|
270
|
+
|
|
271
|
+
client = AsyncDeviceClient(
|
|
272
|
+
server_host="127.0.0.1",
|
|
273
|
+
server_port=8000,
|
|
274
|
+
api_spec=None,
|
|
275
|
+
object_name="simple",
|
|
276
|
+
)
|
|
277
|
+
|
|
278
|
+
result = await client.add(1, 2)
|
|
279
|
+
```
|
|
280
|
+
|
|
281
|
+
Python の property 自体には `await` 構文がないため、Async client の property transport は内部で同期 HTTP client を使用する。
|
|
282
|
+
|
|
283
|
+
## DeviceProxy
|
|
284
|
+
|
|
285
|
+
`DeviceProxy` は、登録された device class 名から Sync / Async client を生成する。
|
|
286
|
+
|
|
287
|
+
機器パッケージの `__init__.py` などで `register_device_proxy()` を実行する。
|
|
288
|
+
|
|
289
|
+
```python
|
|
290
|
+
from ese774_frame import DeviceProxy
|
|
291
|
+
from ese774_frame.clients import register_device_proxy
|
|
292
|
+
|
|
293
|
+
register_device_proxy(
|
|
294
|
+
"SimpleCtrl",
|
|
295
|
+
async_client_cls=AsyncSimpleClient,
|
|
296
|
+
sync_client_cls=SyncSimpleClient,
|
|
297
|
+
api_spec=None,
|
|
298
|
+
object_name="simple",
|
|
299
|
+
default_async_mode=True,
|
|
300
|
+
aliases=["simple"],
|
|
301
|
+
)
|
|
302
|
+
```
|
|
303
|
+
|
|
304
|
+
利用側では登録済みの class 名または alias を指定する。
|
|
305
|
+
|
|
306
|
+
```python
|
|
307
|
+
from server import DeviceProxy
|
|
308
|
+
|
|
309
|
+
client = DeviceProxy(
|
|
310
|
+
"SimpleCtrl",
|
|
311
|
+
async_mode=False,
|
|
312
|
+
)
|
|
313
|
+
|
|
314
|
+
print(client.ping())
|
|
315
|
+
```
|
|
316
|
+
|
|
317
|
+
機器固有 client class を登録しない場合は、フレーム標準の `SyncDeviceClient` / `AsyncDeviceClient` を使用する。
|
|
318
|
+
|
|
319
|
+
## `.pyi` 生成
|
|
320
|
+
|
|
321
|
+
実行時の自動 dispatch や `DeviceProxy` は動的に API を構成するため、そのままでは IDE が機器固有 API の型を推論できない。
|
|
322
|
+
|
|
323
|
+
`make_pyi_device_client()` は client 用 stub を生成する。
|
|
324
|
+
|
|
325
|
+
自動 dispatch の場合は `device_class` を渡す。
|
|
326
|
+
|
|
327
|
+
```python
|
|
328
|
+
from ese774_frame.clients.make_pyi_device_client import make_pyi_device_client
|
|
329
|
+
|
|
330
|
+
make_pyi_device_client(
|
|
331
|
+
filename="sync_simple_client.pyi",
|
|
332
|
+
device_class=SimpleCtrl,
|
|
333
|
+
class_name="SyncSimpleClient",
|
|
334
|
+
async_mode=False,
|
|
335
|
+
)
|
|
336
|
+
|
|
337
|
+
make_pyi_device_client(
|
|
338
|
+
filename="async_simple_client.pyi",
|
|
339
|
+
device_class=SimpleCtrl,
|
|
340
|
+
class_name="AsyncSimpleClient",
|
|
341
|
+
async_mode=True,
|
|
342
|
+
)
|
|
343
|
+
```
|
|
344
|
+
|
|
345
|
+
`device_class` から、自動 dispatch と同じ基準で public method/property を収集して stub を生成する。
|
|
346
|
+
|
|
347
|
+
`ApiSpec` モードでは `api_spec` を渡す。
|
|
348
|
+
|
|
349
|
+
```python
|
|
350
|
+
make_pyi_device_client(
|
|
351
|
+
filename="sync_simple_client.pyi",
|
|
352
|
+
api_spec=simple_api_spec,
|
|
353
|
+
class_name="SyncSimpleClient",
|
|
354
|
+
async_mode=False,
|
|
355
|
+
)
|
|
356
|
+
```
|
|
357
|
+
|
|
358
|
+
`api_spec` と `device_class` は同時には指定しない。
|
|
359
|
+
|
|
360
|
+
明示 `ApiSpec` モードの Router stub は `make_pyi_device_router()` で生成する。
|
|
361
|
+
|
|
362
|
+
```python
|
|
363
|
+
from ese774_frame.routers.make_pyi_device_router import make_pyi_device_router
|
|
364
|
+
|
|
365
|
+
make_pyi_device_router(
|
|
366
|
+
filename="simple_router.pyi",
|
|
367
|
+
api_spec=simple_api_spec,
|
|
368
|
+
class_name="SimpleRouter",
|
|
369
|
+
)
|
|
370
|
+
```
|
|
371
|
+
|
|
372
|
+
## DeviceProxy 用 `.pyi`
|
|
373
|
+
|
|
374
|
+
`DeviceProxy()` は registry から実行時に client class を選択するため、戻り型を静的に決定できない。
|
|
375
|
+
|
|
376
|
+
機器パッケージ側の `__init__.pyi` に overload を生成し、IDE に device 固有 client 型を与える。
|
|
377
|
+
|
|
378
|
+
```python
|
|
379
|
+
from ese774_frame.clients.make_pyi_device_proxy import make_pyi_device_proxy
|
|
380
|
+
|
|
381
|
+
make_pyi_device_proxy(
|
|
382
|
+
filename=str(root / "__init__.pyi"),
|
|
383
|
+
import_lines=[
|
|
384
|
+
"from server.clients import SyncSimpleClient",
|
|
385
|
+
"from server.clients import AsyncSimpleClient",
|
|
386
|
+
],
|
|
387
|
+
device_class="SimpleCtrl",
|
|
388
|
+
aliases=["simple"],
|
|
389
|
+
sync_client_class_name="SyncSimpleClient",
|
|
390
|
+
async_client_class_name="AsyncSimpleClient",
|
|
391
|
+
all_names=[
|
|
392
|
+
"SyncSimpleClient",
|
|
393
|
+
"AsyncSimpleClient",
|
|
394
|
+
"DeviceProxy",
|
|
395
|
+
],
|
|
396
|
+
)
|
|
397
|
+
```
|
|
398
|
+
|
|
399
|
+
実行時には `ese774_frame.DeviceProxy` をそのまま re-export し、機器固有 wrapper は作成しない。型情報だけを `.pyi` で補う。
|
|
400
|
+
|
|
401
|
+
## チュートリアル
|
|
402
|
+
|
|
403
|
+
最小構成から server、client、`DeviceProxy`、`.pyi` 生成までの手順は [TUTORIAL.ja.md](TUTORIAL.ja.md) を参照。
|
|
404
|
+
|
|
405
|
+
## 作者
|
|
406
|
+
|
|
407
|
+
- Kengo NAKADA
|