sequence-base 0.4.30__tar.gz → 0.4.32__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.
- {sequence_base-0.4.30 → sequence_base-0.4.32}/PKG-INFO +5 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/pyproject.toml +2 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/__init__.py +2 -6
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/by_name.py +44 -7
- sequence_base-0.4.32/sequence_base/codec/marked.py +337 -0
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/constants/version.py +3 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/contract/__init__.py +1 -2
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/contract/connect.py +12 -5
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/contract/deployments.py +11 -9
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/contract/flags.py +2 -0
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/contract/io.py +3 -4
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/contract/own_io.py +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/contract/policy.py +13 -11
- sequence_base-0.4.32/sequence_base/contract/retired.py +22 -0
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/contract/wire.py +9 -9
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/presets/robot_arm.py +1 -10
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schema_export.py +0 -2
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/ActRequest.json +1 -28
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/ActResponse.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/ActionChunk.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/ActionContract.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/ActionStep.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/Actions.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/AdapterPair.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/AddLocal.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/Autoscaler.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/BenchmarkConditionSpec.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/BenchmarkRegisterRequest.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/BenchmarkSpec.json +2 -2
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/BenchmarkStatusResponse.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/BootstrapResponse.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/Camera.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/CodeBundle.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/Concurrency.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/Conditions.json +1 -1
- sequence_base-0.4.32/sequence_base/schemas/ConnectRequest.json +16 -0
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/ConnectResponse.json +1 -25
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/DeploymentAccepted.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/DeploymentPolicy.json +2 -59
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/DeploymentRequest.json +2 -59
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/DeploymentStatusResponse.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/ErrorBody.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/ErrorCodes.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/Estimate.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/EvalDryRunResponse.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/EvalReport.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/EvalRequest.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/EvalResponse.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/ImageFrame.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/ImageSpec.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/ImageStepAddLocal.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/ImageStepApt.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/ImageStepEnv.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/ImageStepProject.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/ImageStepRun.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/ImageStepTemplateFiles.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/ImageStepUvPip.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/InferParam.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/Lease.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/MetricAgg.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/Observation.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/ObservationContract.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/Observations.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/ObserveRequest.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/ObserveResponse.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/PolicyRegistration.json +4 -61
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/PolicySpec.json +2 -59
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/Project.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/Proprioception.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/RenderSpec.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/ReplaySpec.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/Resources.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/RolloutResult.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/SecretCreateRequest.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/SecretInfo.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/SecretRef.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/SeqFlags.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/Step.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/Stream.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/TaskAgg.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/TemplateFiles.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/Tensors.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/Timeouts.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/UploadTarget.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/Variant.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/VolumeFile.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/VolumeInfo.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/VolumeMount.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/VolumeRef.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/VolumeUploadRequest.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/VolumeUploadResponse.json +1 -1
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/schemas/WarmingError.json +1 -1
- sequence_base-0.4.30/sequence_base/feedback.py +0 -106
- sequence_base-0.4.30/sequence_base/schemas/ConnectRequest.json +0 -29
- sequence_base-0.4.30/sequence_base/schemas/Embodiment.json +0 -301
- {sequence_base-0.4.30 → sequence_base-0.4.32}/.gitignore +0 -0
- {sequence_base-0.4.30 → sequence_base-0.4.32}/README.md +0 -0
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/auth.py +0 -0
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/codec/__init__.py +0 -0
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/codec/image.py +0 -0
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/constants/__init__.py +0 -0
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/constants/cards.py +0 -0
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/constants/headers.py +0 -0
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/constants/limits.py +0 -0
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/construct.py +0 -0
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/contract/accounts.py +0 -0
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/contract/act.py +0 -0
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/contract/adapters.py +0 -0
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/contract/benchmarks.py +0 -0
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/contract/errors.py +0 -0
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/contract/eval.py +0 -0
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/contract/obs_schedule.py +0 -0
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/contract/observe.py +0 -0
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/contract/templates.py +0 -0
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/contract/volumes.py +0 -0
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/episode.py +0 -0
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/errors/__init__.py +0 -0
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/errors/transport.py +0 -0
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/msgpack_io.py +0 -0
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/obs/__init__.py +0 -0
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/obs/log.py +0 -0
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/obs/rid.py +0 -0
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/presets/__init__.py +0 -0
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/presets/frames.py +0 -0
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/telemetry/__init__.py +0 -0
- {sequence_base-0.4.30 → sequence_base-0.4.32}/sequence_base/telemetry/events.py +0 -0
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
Metadata-Version: 2.5
|
|
2
2
|
Name: sequence-base
|
|
3
|
-
Version: 0.4.
|
|
3
|
+
Version: 0.4.32
|
|
4
4
|
Summary: Shared foundation for the Sequences platform — wire contract, correlation, error taxonomy, constants. Used by the robot SDK, gateway, and container harness.
|
|
5
5
|
Project-URL: Changelog, https://generalsequences.com/docs/changelog/
|
|
6
6
|
Requires-Python: >=3.10
|
|
@@ -8,6 +8,10 @@ Requires-Dist: pydantic>=2.0
|
|
|
8
8
|
Provides-Extra: codec
|
|
9
9
|
Requires-Dist: numpy>=1.26; extra == 'codec'
|
|
10
10
|
Requires-Dist: pillow>=10; extra == 'codec'
|
|
11
|
+
Provides-Extra: observe
|
|
12
|
+
Requires-Dist: av>=17; extra == 'observe'
|
|
13
|
+
Requires-Dist: numpy>=1.26; extra == 'observe'
|
|
14
|
+
Requires-Dist: zstandard>=0.22; extra == 'observe'
|
|
11
15
|
Provides-Extra: test
|
|
12
16
|
Requires-Dist: hypothesis>=6; extra == 'test'
|
|
13
17
|
Requires-Dist: jsonschema>=4; extra == 'test'
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
[project]
|
|
2
2
|
name = "sequence-base"
|
|
3
|
-
version = "0.4.
|
|
3
|
+
version = "0.4.32"
|
|
4
4
|
description = "Shared foundation for the Sequences platform — wire contract, correlation, error taxonomy, constants. Used by the robot SDK, gateway, and container harness."
|
|
5
5
|
requires-python = ">=3.10"
|
|
6
6
|
dependencies = ["pydantic>=2.0"]
|
|
@@ -10,6 +10,7 @@ Changelog = "https://generalsequences.com/docs/changelog/"
|
|
|
10
10
|
|
|
11
11
|
[project.optional-dependencies]
|
|
12
12
|
codec = ["pillow>=10", "numpy>=1.26"]
|
|
13
|
+
observe = ["numpy>=1.26", "av>=17", "zstandard>=0.22"]
|
|
13
14
|
test = ["pytest", "jsonschema>=4", "hypothesis>=6", "pyyaml"]
|
|
14
15
|
|
|
15
16
|
[build-system]
|
|
@@ -24,7 +24,6 @@ from sequence_base.contract import (
|
|
|
24
24
|
Project,
|
|
25
25
|
ImageStepProject,
|
|
26
26
|
Camera,
|
|
27
|
-
Embodiment,
|
|
28
27
|
ObservationContract,
|
|
29
28
|
ObserveFrame,
|
|
30
29
|
ObserveRequest,
|
|
@@ -130,9 +129,6 @@ from sequence_base.errors.transport import (
|
|
|
130
129
|
from sequence_base.episode import Episode
|
|
131
130
|
|
|
132
131
|
|
|
133
|
-
from sequence_base.feedback import Feedback
|
|
134
|
-
|
|
135
|
-
|
|
136
132
|
from sequence_base import auth
|
|
137
133
|
|
|
138
134
|
|
|
@@ -148,7 +144,7 @@ __all__ = [
|
|
|
148
144
|
|
|
149
145
|
"SeqFlags", "ImageStepUvPip", "ImageStepApt", "ImageStepEnv", "ImageStepRun", "AddLocal", "ImageStepAddLocal",
|
|
150
146
|
"FROZEN_PATH", "TemplateFiles", "ImageStepTemplateFiles", "Project", "ImageStepProject", "ImageStep", "ImageSpec",
|
|
151
|
-
"VolumeMount", "VolumeRef", "Concurrency", "ActionContract", "Camera", "ObservationContract",
|
|
147
|
+
"VolumeMount", "VolumeRef", "Concurrency", "ActionContract", "Camera", "ObservationContract",
|
|
152
148
|
"PolicySpec", "PolicyRegistration", "PolicyConstructor",
|
|
153
149
|
"Observations", "Stream", "Actions", "Tensors",
|
|
154
150
|
|
|
@@ -177,7 +173,7 @@ __all__ = [
|
|
|
177
173
|
|
|
178
174
|
"TransportUnavailable", "TransportWarming", "TransportRejected", "TransportOverloaded",
|
|
179
175
|
|
|
180
|
-
"Episode",
|
|
176
|
+
"Episode",
|
|
181
177
|
|
|
182
178
|
"auth",
|
|
183
179
|
]
|
|
@@ -14,6 +14,13 @@ the platform refused to deploy one - so binding them by name changes nothing a c
|
|
|
14
14
|
that takes one beside its inference parameters keeps taking its inputs whole. The SDK reads the rule when a class is
|
|
15
15
|
declared (seq/named.py, registry.infer_params), the worker when it calls the method (harness/handler/loader.py): one
|
|
16
16
|
rule on both sides.
|
|
17
|
+
|
|
18
|
+
What the platform hands a method itself is `episode` - an act function, an observe function and the method an
|
|
19
|
+
episode's end calls alike - and an eval's `seed`; `retired(parameters, what)` refuses a method that still takes what it
|
|
20
|
+
handed once (episode_id, embodiment, feedback), and `ends(parameters, what)` an end method that takes anything but the episode,
|
|
21
|
+
each in words that say what to write instead - the SDK when a class is declared, the worker when it loads one declared
|
|
22
|
+
before.
|
|
23
|
+
|
|
17
24
|
"""
|
|
18
25
|
from __future__ import annotations
|
|
19
26
|
|
|
@@ -22,12 +29,17 @@ from collections.abc import Iterable, Mapping
|
|
|
22
29
|
from dataclasses import dataclass
|
|
23
30
|
from typing import Any
|
|
24
31
|
|
|
25
|
-
__all__ = ["INFER_PLATFORM", "OBSERVE_PLATFORM", "ByName", "takes_by_name"]
|
|
32
|
+
__all__ = ["INFER_PLATFORM", "OBSERVE_PLATFORM", "RETIRED", "ByName", "ends", "retired", "takes_by_name"]
|
|
33
|
+
|
|
26
34
|
|
|
27
35
|
|
|
36
|
+
INFER_PLATFORM = frozenset({"seed", "episode", "plan", "robot"})
|
|
37
|
+
OBSERVE_PLATFORM = frozenset({"step", "episode"})
|
|
28
38
|
|
|
29
|
-
|
|
30
|
-
|
|
39
|
+
|
|
40
|
+
RETIRED = {"episode_id": "take episode, a seq.Episode, and read episode.id",
|
|
41
|
+
"embodiment": "send what the robot is with its observations, in observe(x)",
|
|
42
|
+
"feedback": "send what the robot was playing with its observations, in observe(x)"}
|
|
31
43
|
|
|
32
44
|
_VARIADIC = (inspect.Parameter.VAR_POSITIONAL, inspect.Parameter.VAR_KEYWORD)
|
|
33
45
|
|
|
@@ -47,7 +59,7 @@ class ByName:
|
|
|
47
59
|
def call(self, inputs: Any, what: str) -> tuple[list, dict]:
|
|
48
60
|
"""(args, kwargs) the method `what` ("Model.predict") is called with for an act's `inputs`; ValueError, in its
|
|
49
61
|
words, for inputs that are not a dict of its arguments."""
|
|
50
|
-
takes = ", ".join(n if n in self.required else f"{n} (optional)" for n in self.names)
|
|
62
|
+
takes = ", ".join(n if n in self.required else f"{n} (optional)" for n in self.names) or "none of them"
|
|
51
63
|
if not isinstance(inputs, Mapping):
|
|
52
64
|
raise ValueError(f"{what} takes its inputs by name ({takes}): an act's inputs are a dict of them, and "
|
|
53
65
|
f"these are a {type(inputs).__name__}")
|
|
@@ -73,18 +85,43 @@ class ByName:
|
|
|
73
85
|
return args, {k: v for k, v in inputs.items() if k not in self.positional}
|
|
74
86
|
|
|
75
87
|
|
|
76
|
-
def takes_by_name(parameters: Iterable[inspect.Parameter], platform: frozenset[str] = frozenset()
|
|
88
|
+
def takes_by_name(parameters: Iterable[inspect.Parameter], platform: frozenset[str] = frozenset(), *,
|
|
89
|
+
always: bool = False) -> ByName | None:
|
|
77
90
|
"""How a method of these `parameters` (self left out) takes an act's inputs: by name (ByName) when two or more of
|
|
78
|
-
its arguments - *args, **kwargs and `platform`'s left out - have no default, else None: whole, as one argument.
|
|
91
|
+
its arguments - *args, **kwargs and `platform`'s left out - have no default, else None: whole, as one argument.
|
|
92
|
+
`always`: by name however many it takes - an infer= beside observe=, handed an act's arguments alone (plan3.5/92)."""
|
|
79
93
|
every = list(parameters)
|
|
80
94
|
params = [p for p in every if p.kind not in _VARIADIC and p.name not in platform]
|
|
81
95
|
required = tuple(p.name for p in params if p.default is inspect.Parameter.empty)
|
|
82
|
-
if len(required) < 2:
|
|
96
|
+
if len(required) < 2 and not always:
|
|
83
97
|
return None
|
|
84
98
|
return ByName(names=tuple(p.name for p in params), required=required,
|
|
85
99
|
positional=tuple(p.name for p in params if p.kind is inspect.Parameter.POSITIONAL_ONLY),
|
|
86
100
|
rest=any(p.kind is inspect.Parameter.VAR_KEYWORD for p in every), platform=frozenset(platform))
|
|
87
101
|
|
|
88
102
|
|
|
103
|
+
def retired(parameters: Iterable[inspect.Parameter], what: str) -> str | None:
|
|
104
|
+
"""Why `what` ("Model.infer"), a method the platform calls, cannot be deployed: it takes what the platform no longer
|
|
105
|
+
hands it (RETIRED), said with what to write instead - or None, when it takes none of it."""
|
|
106
|
+
names = [p.name for p in parameters if p.name in RETIRED]
|
|
107
|
+
if not names:
|
|
108
|
+
return None
|
|
109
|
+
return (f"{what} takes {' and '.join(names)}, which the platform no longer hands it: "
|
|
110
|
+
+ "; ".join(RETIRED[n] for n in names))
|
|
111
|
+
|
|
112
|
+
|
|
113
|
+
def ends(parameters: Iterable[inspect.Parameter], what: str) -> str | None:
|
|
114
|
+
"""Why `what` ("Model.end"), the method an episode's end calls (@seq.on_episode), cannot be deployed: an episode's
|
|
115
|
+
end hands it the episode alone, so it takes `episode` or nothing - any other argument with a default, never one
|
|
116
|
+
the platform no longer hands (RETIRED) - or None, when it does."""
|
|
117
|
+
taken = [p.name for p in parameters if p.kind not in _VARIADIC
|
|
118
|
+
and (p.name in RETIRED or (p.name != "episode" and p.default is inspect.Parameter.empty))]
|
|
119
|
+
if not taken:
|
|
120
|
+
return None
|
|
121
|
+
name = what.rsplit(".", 1)[-1]
|
|
122
|
+
return (f"{what} takes {' and '.join(taken)}: an episode's end hands it the episode alone - write "
|
|
123
|
+
f"def {name}(self, episode) and read its id as episode.id, or def {name}(self)")
|
|
124
|
+
|
|
125
|
+
|
|
89
126
|
def _keys(names: list) -> str:
|
|
90
127
|
return ", ".join(repr(n) for n in names)
|
|
@@ -0,0 +1,337 @@
|
|
|
1
|
+
"""
|
|
2
|
+
Marked observation items: what the observation format puts on the wire. A robot marks items of its own observe data as
|
|
3
|
+
sequence_ai.Video, Depth or Tactile; each marked item travels as the map below and the worker turns it back into the
|
|
4
|
+
array it was, so the policy's observe function reads the data the robot built, item for item.
|
|
5
|
+
|
|
6
|
+
|
|
7
|
+
|
|
8
|
+
In one sentence: the robot's SDK keeps one Encoder per marked item of an episode (its path in the observe data) → each
|
|
9
|
+
observe() puts the map that item's encoder writes in place of the marked value → the worker keeps one Decoder per path
|
|
10
|
+
of each episode (Streams) and puts each map's array back (decode) before the policy's observe function is called.
|
|
11
|
+
|
|
12
|
+
The three kinds, as the user named them:
|
|
13
|
+
- video - an RGB camera frame, HxWx3 uint8: H.264 for low latency - no B-frames, no lookahead, every frame out of the
|
|
14
|
+
encoder as it goes in - with a keyframe every second (KEYFRAME_S) and whenever the robot asks for one (force_keyframe:
|
|
15
|
+
after a reconnect, or after frames it dropped). Lossy (crf VIDEO_CRF).
|
|
16
|
+
- depth - a depth map of any integer or float dtype, in the robot's own unit: lossless. Each frame on its own, every
|
|
17
|
+
value predicted from its left neighbour (an integer's difference, a float's bits XORed) and the bytes zstd-compressed.
|
|
18
|
+
640x480 sensor depth comes to about 2.3-2.5 times smaller in about a millisecond each way, as small as anything else
|
|
19
|
+
measured and the fastest; frames are not predicted from the frame before, because a sensor's noise is new in every
|
|
20
|
+
frame and that gained nothing.
|
|
21
|
+
- tactile - a tactile reading. Image-like (HxWx3 uint8, what a camera-based sensor gives) is H.264 at high quality
|
|
22
|
+
(crf TACTILE_CRF); any other array, a pressure grid, travels as it is. Named tactile whatever it travels as.
|
|
23
|
+
|
|
24
|
+
The map, version 1 (inside the observe body's msgpack; `data` is bin):
|
|
25
|
+
{"__seq__": "video" | "tactile", "v": 1, "codec": "h264", "w", "h", "n", "kf", "data"}
|
|
26
|
+
w, h: the frame's size (an odd one is padded to even for the encoder and cut back after); n: the frame's number in
|
|
27
|
+
its stream, from 0, never reused - a gap in n is frames the robot dropped; kf: a keyframe, which a decoder can
|
|
28
|
+
start from; data: one H.264 access unit (Annex B, its parameter sets in front of every keyframe).
|
|
29
|
+
{"__seq__": "depth", "v": 1, "codec": "zstd-delta" | "zstd-xor", "dtype", "shape", "data"}
|
|
30
|
+
dtype: numpy's string for it ("<u2", "<f4", ...); shape: the array's; data: the predicted values' bytes, byte
|
|
31
|
+
planes apart, zstd-compressed.
|
|
32
|
+
{"__seq__": "tactile", "v": 1, "codec": "raw", "value"}
|
|
33
|
+
value: the array (or whatever was marked), as msgpack carries any array.
|
|
34
|
+
|
|
35
|
+
WHY a map with a reserved key rather than a msgpack extension type: sequence_base.msgpack_io refuses every extension
|
|
36
|
+
type, so that reading a body runs nothing its sender chose; a map reads as data everywhere.
|
|
37
|
+
WHY the codecs live here: the SDK encodes with the same module the worker decodes with, so the two cannot drift, and one
|
|
38
|
+
round-trip test pins the format (tests/test_marked.py), as codec/image.py does for the frames of the robot-arm preset.
|
|
39
|
+
|
|
40
|
+
Needs numpy, PyAV (av) and zstandard - `pip install 'sequence-base[observe]'`; each is imported where a codec first
|
|
41
|
+
needs it, so nothing here is needed by a robot that marks nothing.
|
|
42
|
+
|
|
43
|
+
enc = encoder("video"); wire = enc.encode(frame); enc.force_keyframe() # the robot, one per marked item
|
|
44
|
+
streams = Streams(); value = decode(value, streams) # the worker, one Streams per episode
|
|
45
|
+
"""
|
|
46
|
+
from __future__ import annotations
|
|
47
|
+
|
|
48
|
+
import time
|
|
49
|
+
from fractions import Fraction
|
|
50
|
+
from typing import Any, Callable
|
|
51
|
+
|
|
52
|
+
__all__ = ["KINDS", "MARK", "VERSION", "Decoder", "Encoder", "MarkedError", "NeedsKeyframe", "Streams", "decode",
|
|
53
|
+
"decode_one", "encoder", "is_marked"]
|
|
54
|
+
|
|
55
|
+
MARK = "__seq__"
|
|
56
|
+
VERSION = 1
|
|
57
|
+
KINDS = ("video", "depth", "tactile")
|
|
58
|
+
|
|
59
|
+
KEYFRAME_S = 1.0
|
|
60
|
+
VIDEO_CRF = 23
|
|
61
|
+
TACTILE_CRF = 12
|
|
62
|
+
_PRESET = "ultrafast"
|
|
63
|
+
_ZSTD_LEVEL = 1
|
|
64
|
+
|
|
65
|
+
|
|
66
|
+
class MarkedError(ValueError):
|
|
67
|
+
"""A value a marker cannot carry (encoding), or a map that is not one this reads (decoding)."""
|
|
68
|
+
|
|
69
|
+
|
|
70
|
+
class NeedsKeyframe(MarkedError):
|
|
71
|
+
"""A video frame that follows a gap in its stream and is not a keyframe: nothing before it to decode it from. The
|
|
72
|
+
robot's encoder sends a keyframe after any frame it dropped (force_keyframe), so this is never the robot's data."""
|
|
73
|
+
|
|
74
|
+
|
|
75
|
+
def is_marked(value: Any) -> bool:
|
|
76
|
+
return isinstance(value, dict) and value.get(MARK) in KINDS
|
|
77
|
+
|
|
78
|
+
|
|
79
|
+
def _wire(kind: str, **fields: Any) -> dict:
|
|
80
|
+
"""A marked item's map: its kind under MARK, the version, then its codec's fields."""
|
|
81
|
+
return dict([(MARK, kind), ("v", VERSION), *fields.items()])
|
|
82
|
+
|
|
83
|
+
|
|
84
|
+
|
|
85
|
+
class Encoder:
|
|
86
|
+
"""One marked item's stream: `encode(value)` -> its map for this observe; `force_keyframe()` makes the next video
|
|
87
|
+
frame a keyframe."""
|
|
88
|
+
|
|
89
|
+
kind = ""
|
|
90
|
+
|
|
91
|
+
def encode(self, value: Any) -> dict:
|
|
92
|
+
raise NotImplementedError
|
|
93
|
+
|
|
94
|
+
def force_keyframe(self) -> None:
|
|
95
|
+
"""Nothing to do for a kind with no state between frames."""
|
|
96
|
+
|
|
97
|
+
|
|
98
|
+
def encoder(kind: str, *, clock: Callable[[], float] = time.monotonic) -> Encoder:
|
|
99
|
+
"""A new stream's encoder for `kind` ("video", "depth" or "tactile")."""
|
|
100
|
+
if kind == "video":
|
|
101
|
+
return _VideoEncoder(clock)
|
|
102
|
+
if kind == "depth":
|
|
103
|
+
return _DepthEncoder()
|
|
104
|
+
if kind == "tactile":
|
|
105
|
+
return _TactileEncoder(clock)
|
|
106
|
+
raise MarkedError(f"no marker {kind!r}: the kinds are {', '.join(KINDS)}")
|
|
107
|
+
|
|
108
|
+
|
|
109
|
+
class _H264:
|
|
110
|
+
"""libx264 for one stream: low latency, every frame out at once, a forced keyframe an IDR the decoder starts from."""
|
|
111
|
+
|
|
112
|
+
def __init__(self, crf: int, clock: Callable[[], float]) -> None:
|
|
113
|
+
self._crf, self._clock = crf, clock
|
|
114
|
+
self._ctx = None
|
|
115
|
+
self._size: tuple[int, int] | None = None
|
|
116
|
+
self._n = 0
|
|
117
|
+
self._key_at: float | None = None
|
|
118
|
+
self._force = True
|
|
119
|
+
|
|
120
|
+
def force_keyframe(self) -> None:
|
|
121
|
+
self._force = True
|
|
122
|
+
|
|
123
|
+
def encode(self, frame: Any, kind: str) -> dict:
|
|
124
|
+
import av
|
|
125
|
+
import numpy as np
|
|
126
|
+
|
|
127
|
+
a = np.asarray(frame)
|
|
128
|
+
if a.dtype != np.uint8 or a.ndim != 3 or a.shape[2] != 3 or a.shape[0] < 2 or a.shape[1] < 2:
|
|
129
|
+
raise MarkedError(f"a {kind} frame is an RGB image, HxWx3 uint8; got {a.dtype} {tuple(a.shape)} - send other "
|
|
130
|
+
"arrays unmarked, or as Depth or Tactile")
|
|
131
|
+
h, w = int(a.shape[0]), int(a.shape[1])
|
|
132
|
+
if (h, w) != self._size:
|
|
133
|
+
self._open(av, h, w)
|
|
134
|
+
if h % 2 or w % 2:
|
|
135
|
+
a = np.pad(a, ((0, h % 2), (0, w % 2), (0, 0)), mode="edge")
|
|
136
|
+
now = self._clock()
|
|
137
|
+
key = self._force or self._key_at is None or now - self._key_at >= KEYFRAME_S
|
|
138
|
+
vf = av.VideoFrame.from_ndarray(np.ascontiguousarray(a), format="rgb24").reformat(format="yuv420p")
|
|
139
|
+
vf.pts = self._n
|
|
140
|
+
if key:
|
|
141
|
+
vf.pict_type = av.video.frame.PictureType.I
|
|
142
|
+
packets = self._ctx.encode(vf)
|
|
143
|
+
if len(packets) != 1:
|
|
144
|
+
raise MarkedError(f"the H.264 encoder answered {len(packets)} packets for one frame")
|
|
145
|
+
data = bytes(packets[0])
|
|
146
|
+
kf = bool(packets[0].is_keyframe)
|
|
147
|
+
if kf:
|
|
148
|
+
self._key_at, self._force = now, False
|
|
149
|
+
n, self._n = self._n, self._n + 1
|
|
150
|
+
return _wire(kind, codec="h264", w=w, h=h, n=n, kf=kf, data=data)
|
|
151
|
+
|
|
152
|
+
def _open(self, av, h: int, w: int) -> None:
|
|
153
|
+
ctx = av.CodecContext.create("libx264", "w")
|
|
154
|
+
ctx.width, ctx.height, ctx.pix_fmt = w + w % 2, h + h % 2, "yuv420p"
|
|
155
|
+
ctx.time_base = Fraction(1, 30)
|
|
156
|
+
|
|
157
|
+
ctx.options = {"preset": _PRESET, "tune": "zerolatency", "crf": str(self._crf), "forced-idr": "1",
|
|
158
|
+
"x264-params": "keyint=1000000:min-keyint=1:scenecut=0:bframes=0"}
|
|
159
|
+
ctx.thread_count = 1
|
|
160
|
+
ctx.open()
|
|
161
|
+
self._ctx, self._size, self._force = ctx, (h, w), True
|
|
162
|
+
|
|
163
|
+
|
|
164
|
+
class _VideoEncoder(Encoder):
|
|
165
|
+
kind = "video"
|
|
166
|
+
|
|
167
|
+
def __init__(self, clock: Callable[[], float]) -> None:
|
|
168
|
+
self._h264 = _H264(VIDEO_CRF, clock)
|
|
169
|
+
|
|
170
|
+
def encode(self, value: Any) -> dict:
|
|
171
|
+
return self._h264.encode(value, "video")
|
|
172
|
+
|
|
173
|
+
def force_keyframe(self) -> None:
|
|
174
|
+
self._h264.force_keyframe()
|
|
175
|
+
|
|
176
|
+
|
|
177
|
+
class _DepthEncoder(Encoder):
|
|
178
|
+
kind = "depth"
|
|
179
|
+
|
|
180
|
+
def encode(self, value: Any) -> dict:
|
|
181
|
+
import numpy as np
|
|
182
|
+
|
|
183
|
+
a = np.asarray(value)
|
|
184
|
+
if a.dtype.kind not in "uif" or a.ndim < 1 or a.size == 0:
|
|
185
|
+
raise MarkedError(f"a depth map is a non-empty array of integers or floats; got {a.dtype} {tuple(a.shape)}")
|
|
186
|
+
codec, data = _predict(a)
|
|
187
|
+
return _wire("depth", codec=codec, dtype=a.dtype.str, shape=list(a.shape), data=data)
|
|
188
|
+
|
|
189
|
+
|
|
190
|
+
class _TactileEncoder(Encoder):
|
|
191
|
+
kind = "tactile"
|
|
192
|
+
|
|
193
|
+
def __init__(self, clock: Callable[[], float]) -> None:
|
|
194
|
+
self._h264 = _H264(TACTILE_CRF, clock)
|
|
195
|
+
|
|
196
|
+
def encode(self, value: Any) -> dict:
|
|
197
|
+
import numpy as np
|
|
198
|
+
|
|
199
|
+
a = np.asarray(value) if not isinstance(value, (bytes, str, dict)) else None
|
|
200
|
+
if a is not None and a.dtype == np.uint8 and a.ndim == 3 and a.shape[2] == 3 and min(a.shape[:2]) >= 2:
|
|
201
|
+
return self._h264.encode(a, "tactile")
|
|
202
|
+
return _wire("tactile", codec="raw", value=value)
|
|
203
|
+
|
|
204
|
+
def force_keyframe(self) -> None:
|
|
205
|
+
self._h264.force_keyframe()
|
|
206
|
+
|
|
207
|
+
|
|
208
|
+
|
|
209
|
+
def _predict(a) -> tuple[str, bytes]:
|
|
210
|
+
import numpy as np
|
|
211
|
+
import zstandard
|
|
212
|
+
|
|
213
|
+
le = a.astype(a.dtype.newbyteorder("<"), copy=False)
|
|
214
|
+
size = le.dtype.itemsize
|
|
215
|
+
rows = np.ascontiguousarray(le).reshape(-1, le.shape[-1]).view(f"<u{size}")
|
|
216
|
+
out = rows.copy()
|
|
217
|
+
if le.dtype.kind == "f":
|
|
218
|
+
out[:, 1:] = rows[:, 1:] ^ rows[:, :-1]
|
|
219
|
+
codec = "zstd-xor"
|
|
220
|
+
else:
|
|
221
|
+
out[:, 1:] = rows[:, 1:] - rows[:, :-1]
|
|
222
|
+
signed = out.view(f"<i{size}")
|
|
223
|
+
out = ((signed << 1) ^ (signed >> (8 * size - 1))).view(f"<u{size}")
|
|
224
|
+
codec = "zstd-delta"
|
|
225
|
+
planes = out.view(np.uint8).reshape(-1, size).T.tobytes()
|
|
226
|
+
return codec, zstandard.ZstdCompressor(level=_ZSTD_LEVEL).compress(planes)
|
|
227
|
+
|
|
228
|
+
|
|
229
|
+
def _unpredict(m: dict):
|
|
230
|
+
import numpy as np
|
|
231
|
+
import zstandard
|
|
232
|
+
|
|
233
|
+
dtype, shape, codec = np.dtype(m["dtype"]), tuple(int(s) for s in m["shape"]), m["codec"]
|
|
234
|
+
size = dtype.itemsize
|
|
235
|
+
cols = shape[-1]
|
|
236
|
+
raw = zstandard.ZstdDecompressor().decompress(m["data"])
|
|
237
|
+
count = int(np.prod(shape))
|
|
238
|
+
if len(raw) != count * size or codec not in ("zstd-delta", "zstd-xor"):
|
|
239
|
+
raise MarkedError(f"a depth map that does not read back: {codec} {m['dtype']} {list(shape)}")
|
|
240
|
+
rows = np.frombuffer(raw, np.uint8).reshape(size, -1).T.copy().view(f"<u{size}").reshape(-1, cols)
|
|
241
|
+
if codec == "zstd-xor":
|
|
242
|
+
values = np.bitwise_xor.accumulate(rows, axis=1)
|
|
243
|
+
else:
|
|
244
|
+
signed = rows.view(f"<i{size}")
|
|
245
|
+
steps = ((rows >> 1).view(f"<i{size}") ^ -(signed & 1)).view(f"<u{size}")
|
|
246
|
+
values = np.cumsum(steps, axis=1, dtype=f"<u{size}")
|
|
247
|
+
return values.view(dtype.newbyteorder("<")).reshape(shape).astype(dtype, copy=False)
|
|
248
|
+
|
|
249
|
+
|
|
250
|
+
|
|
251
|
+
class Decoder:
|
|
252
|
+
"""One marked item's stream: `decode(map)` -> the array it carries."""
|
|
253
|
+
|
|
254
|
+
def decode(self, m: dict) -> Any:
|
|
255
|
+
return decode_one(m)
|
|
256
|
+
|
|
257
|
+
|
|
258
|
+
class _VideoDecoder(Decoder):
|
|
259
|
+
"""H.264 for one stream, frames in order; after a gap in n it waits for a keyframe (NeedsKeyframe until then)."""
|
|
260
|
+
|
|
261
|
+
def __init__(self) -> None:
|
|
262
|
+
self._ctx = None
|
|
263
|
+
self._last: int | None = None
|
|
264
|
+
self._whole = False
|
|
265
|
+
|
|
266
|
+
def decode(self, m: dict) -> Any:
|
|
267
|
+
import av
|
|
268
|
+
|
|
269
|
+
n, kf = int(m["n"]), bool(m["kf"])
|
|
270
|
+
if self._last is not None and n != self._last + 1:
|
|
271
|
+
self._whole = False
|
|
272
|
+
self._last = n
|
|
273
|
+
if kf:
|
|
274
|
+
self._whole = True
|
|
275
|
+
if not self._whole:
|
|
276
|
+
raise NeedsKeyframe(f"{m.get(MARK)} frame {n} follows a gap in its stream and is not a keyframe")
|
|
277
|
+
if self._ctx is None:
|
|
278
|
+
self._ctx = av.CodecContext.create("h264", "r")
|
|
279
|
+
self._ctx.thread_count = 1
|
|
280
|
+
frames = self._ctx.decode(av.Packet(m["data"]))
|
|
281
|
+
if not frames:
|
|
282
|
+
raise MarkedError(f"{m.get(MARK)} frame {n} decoded to nothing")
|
|
283
|
+
import numpy as np
|
|
284
|
+
|
|
285
|
+
rgb = frames[-1].to_ndarray(format="rgb24")
|
|
286
|
+
h, w = int(m["h"]), int(m["w"])
|
|
287
|
+
return rgb if rgb.shape[:2] == (h, w) else np.ascontiguousarray(rgb[:h, :w])
|
|
288
|
+
|
|
289
|
+
|
|
290
|
+
def decode_one(m: dict) -> Any:
|
|
291
|
+
"""A map with no state between frames - depth, or tactile as it is - back to its value. Video needs its stream's
|
|
292
|
+
Decoder (Streams)."""
|
|
293
|
+
if not is_marked(m) or int(m.get("v") or 0) != VERSION:
|
|
294
|
+
raise MarkedError(f"not a marked item of version {VERSION}: {sorted(m) if isinstance(m, dict) else type(m)}")
|
|
295
|
+
codec = m.get("codec")
|
|
296
|
+
if m[MARK] == "depth":
|
|
297
|
+
return _unpredict(m)
|
|
298
|
+
if m[MARK] == "tactile" and codec == "raw":
|
|
299
|
+
return m.get("value")
|
|
300
|
+
raise MarkedError(f"a {m[MARK]} item in {codec!r} decodes in its stream's order (Streams)")
|
|
301
|
+
|
|
302
|
+
|
|
303
|
+
class Streams:
|
|
304
|
+
"""One episode's decoders, by the path of each marked item in its observe data."""
|
|
305
|
+
|
|
306
|
+
def __init__(self) -> None:
|
|
307
|
+
self._decoders: dict[tuple, Decoder] = {}
|
|
308
|
+
|
|
309
|
+
def decoder(self, path: tuple, m: dict) -> Decoder:
|
|
310
|
+
d = self._decoders.get(path)
|
|
311
|
+
if d is None:
|
|
312
|
+
d = self._decoders[path] = _VideoDecoder() if m.get("codec") == "h264" else Decoder()
|
|
313
|
+
return d
|
|
314
|
+
|
|
315
|
+
|
|
316
|
+
def decode(value: Any, streams: Streams, path: tuple = ()) -> Any:
|
|
317
|
+
"""`value` with every marked map in it - in dicts and lists, at any depth - replaced by its array; everything else
|
|
318
|
+
as it was, the same objects. A map that is not marked is walked; one that is decodes with its path's decoder."""
|
|
319
|
+
if isinstance(value, dict):
|
|
320
|
+
if is_marked(value):
|
|
321
|
+
return streams.decoder(path, value).decode(value)
|
|
322
|
+
if not any(_holds_mark(v) for v in value.values()):
|
|
323
|
+
return value
|
|
324
|
+
return {k: decode(v, streams, path + (k,)) for k, v in value.items()}
|
|
325
|
+
if isinstance(value, list):
|
|
326
|
+
if not any(_holds_mark(v) for v in value):
|
|
327
|
+
return value
|
|
328
|
+
return [decode(v, streams, path + (i,)) for i, v in enumerate(value)]
|
|
329
|
+
return value
|
|
330
|
+
|
|
331
|
+
|
|
332
|
+
def _holds_mark(value: Any) -> bool:
|
|
333
|
+
if isinstance(value, dict):
|
|
334
|
+
return is_marked(value) or any(_holds_mark(v) for v in value.values())
|
|
335
|
+
if isinstance(value, list):
|
|
336
|
+
return any(_holds_mark(v) for v in value)
|
|
337
|
+
return False
|
|
@@ -21,7 +21,6 @@ from sequence_base.contract.observe import ObserveFrame, ObserveRequest, Observe
|
|
|
21
21
|
from sequence_base.contract.flags import SeqFlags
|
|
22
22
|
from sequence_base.contract.policy import (
|
|
23
23
|
Camera,
|
|
24
|
-
Embodiment,
|
|
25
24
|
ObservationContract,
|
|
26
25
|
ActionContract,
|
|
27
26
|
Concurrency,
|
|
@@ -129,7 +128,7 @@ __all__ = [
|
|
|
129
128
|
"SeqFlags",
|
|
130
129
|
"ImageStepUvPip", "ImageStepApt", "ImageStepEnv", "ImageStepRun", "AddLocal", "ImageStepAddLocal",
|
|
131
130
|
"TemplateFiles", "ImageStepTemplateFiles", "Project", "ImageStepProject", "FROZEN_PATH", "ImageStep", "ImageSpec",
|
|
132
|
-
"VolumeMount", "VolumeRef", "Concurrency", "ActionContract", "Camera", "ObservationContract",
|
|
131
|
+
"VolumeMount", "VolumeRef", "Concurrency", "ActionContract", "Camera", "ObservationContract",
|
|
133
132
|
"PolicySpec", "PolicyRegistration", "PolicyConstructor",
|
|
134
133
|
"Observations", "Stream", "Actions", "Tensors",
|
|
135
134
|
|
|
@@ -10,13 +10,15 @@ and the warming ETA are typed and checkable.
|
|
|
10
10
|
from __future__ import annotations
|
|
11
11
|
|
|
12
12
|
from datetime import datetime
|
|
13
|
+
from typing import Any
|
|
13
14
|
|
|
14
|
-
from pydantic import BaseModel, ConfigDict, Field
|
|
15
|
+
from pydantic import BaseModel, ConfigDict, Field, model_validator
|
|
15
16
|
|
|
16
17
|
|
|
17
18
|
from sequence_base.contract.errors import WarmingError
|
|
18
19
|
from sequence_base.contract.io import ActionContract, ObservationContract
|
|
19
20
|
from sequence_base.contract.own_io import Actions, Observations
|
|
21
|
+
from sequence_base.contract.retired import dropped
|
|
20
22
|
|
|
21
23
|
__all__ = ["Lease", "ConnectRequest", "ConnectResponse", "WarmingError"]
|
|
22
24
|
|
|
@@ -37,7 +39,11 @@ class ConnectRequest(BaseModel):
|
|
|
37
39
|
model_config = ConfigDict(extra="forbid")
|
|
38
40
|
|
|
39
41
|
model: str = Field(..., description="Deployment name to connect to")
|
|
40
|
-
|
|
42
|
+
|
|
43
|
+
@model_validator(mode="before")
|
|
44
|
+
@classmethod
|
|
45
|
+
def _retired(cls, data: Any) -> Any:
|
|
46
|
+
return dropped(data, "embodiment")
|
|
41
47
|
|
|
42
48
|
|
|
43
49
|
class ConnectResponse(BaseModel):
|
|
@@ -55,7 +61,6 @@ class ConnectResponse(BaseModel):
|
|
|
55
61
|
|
|
56
62
|
action: ActionContract | None = None
|
|
57
63
|
observation: ObservationContract | None = None
|
|
58
|
-
embodiment: str | None = None
|
|
59
64
|
|
|
60
65
|
io: str | None = None
|
|
61
66
|
|
|
@@ -63,5 +68,7 @@ class ConnectResponse(BaseModel):
|
|
|
63
68
|
observations: Observations | None = None
|
|
64
69
|
actions: Actions | None = None
|
|
65
70
|
|
|
66
|
-
|
|
67
|
-
|
|
71
|
+
@model_validator(mode="before")
|
|
72
|
+
@classmethod
|
|
73
|
+
def _retired(cls, data: Any) -> Any:
|
|
74
|
+
return dropped(data, "embodiment", "feedback")
|
|
@@ -16,13 +16,14 @@ import binascii
|
|
|
16
16
|
import hashlib
|
|
17
17
|
import re
|
|
18
18
|
from enum import Enum
|
|
19
|
-
from typing import Literal
|
|
19
|
+
from typing import Any, Literal
|
|
20
20
|
|
|
21
21
|
from pydantic import BaseModel, ConfigDict, Field, field_validator, model_validator
|
|
22
22
|
|
|
23
23
|
from sequence_base.contract.accounts import SecretRef
|
|
24
|
-
from sequence_base.contract.io import
|
|
24
|
+
from sequence_base.contract.io import ObservationContract
|
|
25
25
|
from sequence_base.contract.own_io import Actions, Observations, Tensors, check_own_io
|
|
26
|
+
from sequence_base.contract.retired import dropped
|
|
26
27
|
from sequence_base.contract.policy import (
|
|
27
28
|
KIND_NAME,
|
|
28
29
|
ActionContract,
|
|
@@ -165,8 +166,9 @@ def describe(param: "InferParam") -> str:
|
|
|
165
166
|
|
|
166
167
|
class DeploymentPolicy(BaseModel):
|
|
167
168
|
"""The policy block of the deployments body. Only `handler_ref` is required. The robot-arm preset's contracts
|
|
168
|
-
(`action`, `observation
|
|
169
|
-
|
|
169
|
+
(`action`, `observation`) are optional since contract 0.4.14: a deployment that declares none is held to nothing and
|
|
170
|
+
its inputs / outputs pass through the worker untouched. One stored from before contract 0.5.29 reads with its
|
|
171
|
+
`embodiments` and `feedback` dropped (contract.retired).
|
|
170
172
|
|
|
171
173
|
`secrets` carries the policy's declared secret BUNDLES BY NAME ONLY (list[SecretRef]) — the gateway
|
|
172
174
|
validates each name exists and belongs to the deployer at submit time, and the
|
|
@@ -176,6 +178,11 @@ class DeploymentPolicy(BaseModel):
|
|
|
176
178
|
|
|
177
179
|
model_config = ConfigDict(extra="forbid")
|
|
178
180
|
|
|
181
|
+
@model_validator(mode="before")
|
|
182
|
+
@classmethod
|
|
183
|
+
def _retired(cls, data: Any) -> Any:
|
|
184
|
+
return dropped(data, "embodiments", "feedback")
|
|
185
|
+
|
|
179
186
|
handler_ref: str
|
|
180
187
|
action: ActionContract | None = None
|
|
181
188
|
|
|
@@ -184,14 +191,9 @@ class DeploymentPolicy(BaseModel):
|
|
|
184
191
|
|
|
185
192
|
|
|
186
193
|
streaming: bool = Field(default=False, exclude=True)
|
|
187
|
-
|
|
188
|
-
|
|
189
|
-
feedback: bool | None = None
|
|
190
194
|
secrets: list[SecretRef] = Field(default_factory=list)
|
|
191
195
|
|
|
192
|
-
|
|
193
196
|
observation: ObservationContract | None = None
|
|
194
|
-
embodiments: dict[str, Embodiment] | None = None
|
|
195
197
|
|
|
196
198
|
|
|
197
199
|
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
"""
|
|
2
|
-
The robot-arm I/O contracts (`action=`, `observation
|
|
2
|
+
The robot-arm I/O contracts (`action=`, `observation=`), re-exported from
|
|
3
3
|
`sequence_base.presets.robot_arm`.
|
|
4
4
|
|
|
5
5
|
Declaring one is optional since contract 0.4.14: a deployment that declares none is held to nothing, and its
|
|
@@ -11,11 +11,10 @@ from sequence_base.presets.robot_arm import (
|
|
|
11
11
|
PROPRIO_FIELDS,
|
|
12
12
|
ActionContract,
|
|
13
13
|
Camera,
|
|
14
|
-
Embodiment,
|
|
15
14
|
ObservationContract,
|
|
16
15
|
fit_hint,
|
|
17
16
|
frame_size_problem,
|
|
18
17
|
)
|
|
19
18
|
|
|
20
|
-
__all__ = ["ActionContract", "PROPRIO_FIELDS", "Camera", "ObservationContract", "
|
|
21
|
-
"
|
|
19
|
+
__all__ = ["ActionContract", "PROPRIO_FIELDS", "Camera", "ObservationContract", "frame_size_problem", "fit_hint",
|
|
20
|
+
"PAYLOAD_HINT"]
|