use api for add model from registry

Author: purplenicole730

docs/examples/module_step3.py

@@ -43,7 +43,7 @@ async def main():
     Registry.register_resource_creator(Sensor.SUBTYPE, MySensor.MODEL, ResourceCreatorRegistration(MySensor.new))
 
     module = Module.from_args()
-    module.add_model_from_registry(Sensor.SUBTYPE, MySensor.MODEL)
+    module.add_model_from_registry(Sensor.API, MySensor.MODEL)
     await module.start()
 
 

examples/complex_module/src/main.py

@@ -15,10 +15,10 @@ async def main():
     Resource models must be pre-registered. For an example, see the `gizmo.__init__.py` file.
     """
     module = Module.from_args()
-    module.add_model_from_registry(Gizmo.SUBTYPE, MyGizmo.MODEL)
-    module.add_model_from_registry(SummationService.SUBTYPE, MySummationService.MODEL)
-    module.add_model_from_registry(Arm.SUBTYPE, MyArm.MODEL)
-    module.add_model_from_registry(Base.SUBTYPE, MyBase.MODEL)
+    module.add_model_from_registry(Gizmo.API, MyGizmo.MODEL)
+    module.add_model_from_registry(SummationService.API, MySummationService.MODEL)
+    module.add_model_from_registry(Arm.API, MyArm.MODEL)
+    module.add_model_from_registry(Base.API, MyBase.MODEL)
     await module.start()
 
 

examples/simple_module/src/main.py

@@ -66,7 +66,7 @@ async def main():
     Registry.register_resource_creator(Sensor.SUBTYPE, MySensor.MODEL, ResourceCreatorRegistration(MySensor.new, MySensor.validate_config))
 
     module = Module.from_args()
-    module.add_model_from_registry(Sensor.SUBTYPE, MySensor.MODEL)
+    module.add_model_from_registry(Sensor.API, MySensor.MODEL)
     await module.start()
 
 

tests/test_module.py

@@ -18,7 +18,7 @@
     ValidateConfigResponse,
 )
 from viam.proto.robot import ResourceRPCSubtype
-from viam.resource.types import Model, Subtype
+from viam.resource.types import Model, API
 from viam.robot.client import RobotClient
 from viam.robot.service import RobotService
 from viam.utils import dict_to_struct
@@ -33,7 +33,7 @@
 @pytest.fixture
 async def module(request):
     module = Module("some_fake_address")
-    module.add_model_from_registry(Gizmo.SUBTYPE, MyGizmo.MODEL)
+    module.add_model_from_registry(Gizmo.API, MyGizmo.MODEL)
     request.cls.module = module
     yield module
     await module.stop()
@@ -175,10 +175,10 @@ async def test_ready(self, module: Module):
 
     def test_add_model_from_registry(self):
         mod = Module("fake")
-        mod.add_model_from_registry(Gizmo.SUBTYPE, MyGizmo.MODEL)
+        mod.add_model_from_registry(Gizmo.API, MyGizmo.MODEL)
 
         with pytest.raises(ValueError):
-            mod.add_model_from_registry(Subtype.from_string("fake:fake:fake"), Model.from_string("faker:faker:faker"))
+            mod.add_model_from_registry(API.from_string("fake:fake:fake"), Model.from_string("faker:faker:faker"))
 
     async def test_multiple_resources_same_model(self, module: Module):
         req = AddResourceRequest(