Adjusted registration logic + role changes

Author: dominiquekleeven

packages/openremote_client/src/openremote_client/models.py

@@ -118,6 +118,9 @@ class ServiceInfo(BaseModel):
     status: ServiceStatus
     """The status of the service, e.g. 'AVAILABLE'"""
 
+    realm: str
+    """The realm of the service, e.g. 'master'"""
+
     instanceId: str | None = None
     """The unique instance identifier of the registered service,
     either generated by the service or provided by the user."""

packages/openremote_client/src/openremote_client/rest_client.py

@@ -412,7 +412,7 @@ def __init__(self, client: "OpenRemoteClient"):
 
         def register(self, service: ServiceInfo) -> ServiceInfo | None:
             """Registers a service with the OpenRemote API."""
-            url = f"{self._client.openremote_url}/api/{MASTER_REALM}/service"
+            url = f"{self._client.openremote_url}/api/{self._client.realm}/service"
             request = self._client._build_request("POST", url, data=service.model_dump())
             with httpx.Client(timeout=self._client.timeout) as client:
                 try:

src/service_ml_forecast/api/model_config_route.py

@@ -56,7 +56,7 @@
     },
 )
 @realm_accessible
-@roles_allowed(resource=OPENREMOTE_KC_RESOURCE, roles=[ClientRoles.WRITE_ADMIN_ROLE])
+@roles_allowed(resource=OPENREMOTE_KC_RESOURCE, roles=[ClientRoles.WRITE_SERVICES_ROLE])
 def create_model_config(
     user: Annotated[UserContext, Depends(KeycloakMiddleware.get_user_context)],
     realm: str,
@@ -77,7 +77,7 @@ def create_model_config(
     },
 )
 @realm_accessible
-@roles_allowed(resource=OPENREMOTE_KC_RESOURCE, roles=[ClientRoles.READ_ADMIN_ROLE])
+@roles_allowed(resource=OPENREMOTE_KC_RESOURCE, roles=[ClientRoles.READ_SERVICES_ROLE])
 def get_model_config(
     user: Annotated[UserContext, Depends(KeycloakMiddleware.get_user_context)],
     realm: str,
@@ -97,7 +97,7 @@ def get_model_config(
     },
 )
 @realm_accessible
-@roles_allowed(resource=OPENREMOTE_KC_RESOURCE, roles=[ClientRoles.READ_ADMIN_ROLE])
+@roles_allowed(resource=OPENREMOTE_KC_RESOURCE, roles=[ClientRoles.READ_SERVICES_ROLE])
 def get_model_configs(
     user: Annotated[UserContext, Depends(KeycloakMiddleware.get_user_context)],
     realm: str,
@@ -117,7 +117,7 @@ def get_model_configs(
     },
 )
 @realm_accessible
-@roles_allowed(resource=OPENREMOTE_KC_RESOURCE, roles=[ClientRoles.WRITE_ADMIN_ROLE])
+@roles_allowed(resource=OPENREMOTE_KC_RESOURCE, roles=[ClientRoles.WRITE_SERVICES_ROLE])
 def update_model_config(
     user: Annotated[UserContext, Depends(KeycloakMiddleware.get_user_context)],
     realm: str,
@@ -142,7 +142,7 @@ def update_model_config(
     },
 )
 @realm_accessible
-@roles_allowed(resource=OPENREMOTE_KC_RESOURCE, roles=[ClientRoles.WRITE_ADMIN_ROLE])
+@roles_allowed(resource=OPENREMOTE_KC_RESOURCE, roles=[ClientRoles.WRITE_SERVICES_ROLE])
 def delete_model_config(
     user: Annotated[UserContext, Depends(KeycloakMiddleware.get_user_context)],
     realm: str,

src/service_ml_forecast/main.py

@@ -108,8 +108,9 @@ def initialize_background_services() -> None:
 
     # Service details for registration
     service_info = ServiceInfo(
-        serviceId="ml-forecast-service",
-        label="ML Forecast Service",
+        serviceId="ml-forecasting",
+        label="ML Forecasting Service",
+        realm=ENV.ML_OR_REALM,
         homepageUrl=f"{ENV.ML_SERVICE_HOSTNAME}{ENV.ML_API_ROOT_PATH}/ui/{{realm}}",
         status=ServiceStatus.AVAILABLE,
     )