Merge pull request #82 from wright-group/yaq-traits-github

yaq-traits v2022.11.0

.pre-commit-config.yaml

@@ -11,8 +11,8 @@ repos:
       - id: mypy
         exclude: ^docs/conf.py
 
-  - repo: https://gitlab.com/yaq/yaq-traits
-    rev: v2022.3.0
+  - repo: https://github.com/yaq-project/yaq-traits
+    rev: v2022.11.0
     hooks:
         - id: yaq-traits-check
 

yaqd_wright/_ndinterp.py

@@ -5,11 +5,11 @@
 
 from scipy.interpolate import RegularGridInterpolator  # type: ignore
 import yaqc  # type: ignore
-from yaqd_core import HasLimits, IsHomeable, HasPosition, IsDaemon
+from yaqd_core import HasLimits, IsHomeable, HasPosition, IsDaemon, HasDependents
 import WrightTools as wt  # type: ignore
 
 
-class NDInterp(HasLimits, IsHomeable, HasPosition, IsDaemon):
+class NDInterp(HasDependents, HasLimits, IsHomeable, HasPosition, IsDaemon):
     _kind = "ndinterp"
 
     def __init__(self, name, config, config_filepath):

yaqd_wright/ndinterp.avpr

@@ -156,6 +156,7 @@
         },
         "get_dependent_hardware": {
             "doc": "Get mapping of name to host:port string. 'localhost' should be replaced on the client side with the host for this daemon.",
+            "origin": "has-dependents",
             "request": [],
             "response": {
                 "type": "map",
@@ -357,13 +358,13 @@
     },
     "properties": {
         "destination": {
-            "control_kind": "normal",
+            "control_kind": "hinted",
             "dynamic": true,
             "getter": "get_destination",
-            "limits_getter": null,
+            "limits_getter": "get_limits",
             "options_getter": null,
             "record_kind": "data",
-            "setter": null,
+            "setter": "set_position",
             "type": "double",
             "units_getter": "get_units"
         },
@@ -396,7 +397,7 @@
             "limits_getter": "get_limits",
             "options_getter": null,
             "record_kind": "data",
-            "setter": "set_position",
+            "setter": null,
             "type": "double",
             "units_getter": "get_units"
         },
@@ -457,6 +458,7 @@
         }
     },
     "traits": [
+        "has-dependents",
         "has-limits",
         "has-position",
         "is-daemon",
@@ -490,4 +492,4 @@
             "type": "record"
         }
     ]
-}
+}

yaqd_wright/ndinterp.toml

@@ -1,6 +1,6 @@
 protocol = "ndinterp"
 doc="yaq daemon representing an NDimensional interpolated offset"
-traits=["has-limits", "is-homeable", "is-daemon"]
+traits=["has-dependents", "has-limits", "is-homeable", "is-daemon"]
 
 [links]
 source = "https://github.com/wright-group/yaqd-wright"
@@ -92,10 +92,6 @@ doc = "Get offset enabled"
 request = [{"name"="enable", type="boolean"}]
 doc = "Set offset enabled"
 
-[messages.get_dependent_hardware]
-response = {type="map", values="string"}
-doc = "Get mapping of name to host:port string. 'localhost' should be replaced on the client side with the host for this daemon."
-
 [properties]
 
 [properties.zero_position]