Renamed AdapterResourceHandlerConfigModel to ResourceHandlerConfigModel

Author: marcus-oscarsson

docs/source/dev/adapter.md

@@ -147,9 +147,9 @@ This generates:
 Below is an example of how to define a resource handler configuration for a `MotorAdapter`:
 
 ```python
-from mxcubeweb.core.models.configmodels import AdapterResourceHandlerConfigModel
+from mxcubeweb.core.models.configmodels import ResourceHandlerConfigModel
 
-resource_handler_config = AdapterResourceHandlerConfigModel(
+resource_handler_config = ResourceHandlerConfigModel(
     commands=[
         "set_value",
         "get_value",

mxcubeweb/core/adapter/actuator_adapter.py

@@ -8,10 +8,10 @@
     FloatValueModel,
     HOActuatorValueChangeModel,
 )
-from mxcubeweb.core.models.configmodels import AdapterResourceHandlerConfigModel
+from mxcubeweb.core.models.configmodels import ResourceHandlerConfigModel
 from mxcubeweb.core.util.networkutils import RateLimited
 
-resource_handler_config = AdapterResourceHandlerConfigModel(
+resource_handler_config = ResourceHandlerConfigModel(
     commands=["get_value", "set_value", "stop"], attributes=["data"]
 )
 

mxcubeweb/core/adapter/adapter_base.py

@@ -16,12 +16,12 @@
     HOActuatorModel,
     HOModel,
 )
-from mxcubeweb.core.models.configmodels import AdapterResourceHandlerConfigModel
+from mxcubeweb.core.models.configmodels import ResourceHandlerConfigModel
 from mxcubeweb.core.server.resource_handler import (
     AdapterResourceHandlerFactory,
 )
 
-default_resource_handler_config = AdapterResourceHandlerConfigModel(
+default_resource_handler_config = ResourceHandlerConfigModel(
     commands=[
         "set_value",
         "get_value",

mxcubeweb/core/adapter/beamline_action_adapter.py

@@ -19,9 +19,9 @@
     HOActuatorValueChangeModel,
     NStateModel,
 )
-from mxcubeweb.core.models.configmodels import AdapterResourceHandlerConfigModel
+from mxcubeweb.core.models.configmodels import ResourceHandlerConfigModel
 
-resource_handler_config = AdapterResourceHandlerConfigModel(
+resource_handler_config = ResourceHandlerConfigModel(
     commands=["stop", "run_action"], attributes=["data", "get_all_actions"]
 )
 
@@ -62,7 +62,7 @@ def __init__(
         ho: HardwareObject,
         role: str,
         app,
-        resource_handler_config: AdapterResourceHandlerConfigModel = resource_handler_config,  # noqa: E501
+        resource_handler_config: ResourceHandlerConfigModel = resource_handler_config,
     ):
         """
         Args:

mxcubeweb/core/adapter/detector_adapter.py

@@ -3,9 +3,9 @@
 from mxcubecore.HardwareObjects.abstract import AbstractDetector
 
 from mxcubeweb.core.adapter.adapter_base import AdapterBase
-from mxcubeweb.core.models.configmodels import AdapterResourceHandlerConfigModel
+from mxcubeweb.core.models.configmodels import ResourceHandlerConfigModel
 
-resource_handler_config = AdapterResourceHandlerConfigModel(
+resource_handler_config = ResourceHandlerConfigModel(
     name="detector_test",
     url_prefix="/mxcube/api/v0.1/detectortest",
     attributes=["data"],

mxcubeweb/core/adapter/energy_adapter.py

@@ -5,9 +5,9 @@
 
 from mxcubeweb.core.adapter.actuator_adapter import ActuatorAdapter
 from mxcubeweb.core.adapter.wavelength_adapter import WavelengthAdapter
-from mxcubeweb.core.models.configmodels import AdapterResourceHandlerConfigModel
+from mxcubeweb.core.models.configmodels import ResourceHandlerConfigModel
 
-resource_handler_config = AdapterResourceHandlerConfigModel(
+resource_handler_config = ResourceHandlerConfigModel(
     commands=["get_value", "set_value", "stop", "get_resolution_limits_for_energy"],
     attributes=["data"],
 )

mxcubeweb/core/adapter/motor_adapter.py

@@ -6,10 +6,10 @@
 from mxcubeweb.core.models.adaptermodels import (
     FloatValueModel,
 )
-from mxcubeweb.core.models.configmodels import AdapterResourceHandlerConfigModel
+from mxcubeweb.core.models.configmodels import ResourceHandlerConfigModel
 from mxcubeweb.core.util.networkutils import RateLimited
 
-resource_handler_config = AdapterResourceHandlerConfigModel(
+resource_handler_config = ResourceHandlerConfigModel(
     url_prefix="/mxcube/api/v0.1/motor_test",
     commands=["set_value", "get_value", "stop"],
     attributes=["data"],

mxcubeweb/core/adapter/nstate_adapter.py

@@ -13,9 +13,9 @@
     NStateModel,
     StrValueModel,
 )
-from mxcubeweb.core.models.configmodels import AdapterResourceHandlerConfigModel
+from mxcubeweb.core.models.configmodels import ResourceHandlerConfigModel
 
-resource_handler_config = AdapterResourceHandlerConfigModel(
+resource_handler_config = ResourceHandlerConfigModel(
     commands=["get_value", "set_value", "stop"], attributes=["data"]
 )
 

mxcubeweb/core/components/workflow.py

@@ -5,12 +5,12 @@
 
 from mxcubeweb.core.components.component_base import ComponentBase
 from mxcubeweb.core.models.configmodels import (
-    AdapterResourceHandlerConfigModel,
+    ResourceHandlerConfigModel,
 )
 
 hwr_logger = logging.getLogger("MX3.HWR")
 
-resource_handler_config = AdapterResourceHandlerConfigModel(
+resource_handler_config = ResourceHandlerConfigModel(
     exports=[
         {
             "attr": "get_available_workflows",

mxcubeweb/core/models/configmodels.py

@@ -5,7 +5,7 @@
     Literal,
 )
 
-from pydantic.v1 import BaseModel, Field, validator
+from pydantic.v1 import BaseModel, Field
 
 
 class FlaskConfigModel(BaseModel):
@@ -205,7 +205,7 @@ class AppConfigModel(BaseModel):
     sso: SSOConfigModel | None
 
 
-class AdapterResourceHandlerConfigModel(BaseModel):
+class ResourceHandlerConfigModel(BaseModel):
     """
     Used to define  which adapter properties and methods that are
     exported over HTTP. An endpoint for each method and/or property