Tweak code to search services for ioc.yaml; Added service_name for if service name does not match prefix

Author: OCopping

example/create_gui.yaml

@@ -24,3 +24,4 @@ components:
   motor:
     desc: Hexapod Stage
     prefix: BL01T-MO-MAP-01:STAGE
+    service_name: bl01t-mo-ioc-01

src/phoebus_guibuilder/datatypes.py

@@ -22,6 +22,7 @@ class Component:
     name: str
     desc: str
     prefix: str
+    service_name: str | None = None
     filename: str | None = None
 
     def __post_init__(self):
@@ -60,7 +61,7 @@ def _extract_p_and_r(self):
         match = re.match(pattern, self.prefix)
         if match:
             self.P: str = match.group(1)
-            self.R: str = match.group(2)
+            self.R: str | None = match.group(2)
             # TODO: Is this needed?
             self.attribute: str | None = match.group(3)
         else:

src/phoebus_guibuilder/guibuilder.py

@@ -58,26 +58,27 @@ def find_services_folders(
             "./example/" + self.beamline.dom + "-services/services"
         )  # TODO: rm hardcoding, map to services.
         path = f"{services_directory}"
-        files = os.listdir(path)
+        services = os.listdir(path)
 
         # Attempting to match the prefix to the files in the services directory
-        pattern = "^(.*)-(.*)-(.*)"
+        # TODO: Improve regex
+        # pattern = "^(.*)-(.*)-(.*)"
 
         for component in self.components:
-            domain: re.Match[str] | None = re.match(pattern, component.P)
-            assert domain is not None, "Empty Prefix Field"
-
-            for file in files:
-                match = re.match(pattern, file)
-                if match:
-                    if match.group(1) == domain.group(1).lower():
-                        if os.path.exists(f"{path}/{file}/config/ioc.yaml"):
-                            self.extract_valid_entities(
-                                ioc_yaml=f"{path}/{file}/config/ioc.yaml",
-                                component=component,
-                            )
-                        else:
-                            print(f"No ioc.yaml file for service: {file}")
+            if component.service_name is not None:
+                service_name = component.service_name
+            else:
+                # if service_name is not provided, resort to P being the service name
+                service_name = component.P.lower()
+
+            for service in services:
+                if os.path.exists(f"{path}/{service_name}/config/ioc.yaml"):
+                    self.extract_valid_entities(
+                        ioc_yaml=f"{path}/{service_name}/config/ioc.yaml",
+                        component=component,
+                    )
+                else:
+                    print(f"No ioc.yaml file for service: {service}")
 
     def extract_valid_entities(self, ioc_yaml: str, component: Component):
         """
@@ -86,17 +87,12 @@ def extract_valid_entities(self, ioc_yaml: str, component: Component):
 
         entities: list[dict[str, str]] = []
 
-        if component.R is not None:
-            component_match = f"{component.P}:{component.R}"
-        else:
-            component_match = component.P
-
         with open(ioc_yaml) as ioc:
             conf = yaml.safe_load(ioc)
             entities = conf["entities"]
             for entity in entities:
                 if (
-                    "P" in entity.keys() and entity["P"] == component_match
+                    "P" in entity.keys() and entity["P"] == component.prefix
                 ):  # the suffix could be M, could be R
                     self.valid_entities.append(
                         Entry(