Change attribute name for configuration

Author: kzscisoft

simvue/run.py

@@ -159,19 +159,19 @@ def __init__(
         self._data: dict[str, typing.Any] = {}
         self._step: int = 0
         self._active: bool = False
-        self._config = SimvueConfiguration.fetch()
+        self._user_config = SimvueConfiguration.fetch()
 
         logging.getLogger(self.__class__.__module__).setLevel(
             logging.DEBUG
             if (debug is not None and debug)
-            or (debug is None and self._config.client.debug)
+            or (debug is None and self._user_config.client.debug)
             else logging.INFO
         )
 
         self._aborted: bool = False
         self._resources_metrics_interval: typing.Optional[int] = HEARTBEAT_INTERVAL
         self._headers: dict[str, str] = {
-            "Authorization": f"Bearer {self._config.server.token}"
+            "Authorization": f"Bearer {self._user_config.server.token}"
         }
         self._simvue: typing.Optional[SimvueBaseClass] = None
         self._pid: typing.Optional[int] = 0
@@ -313,7 +313,8 @@ def _create_heartbeat_callback(
         self,
     ) -> typing.Callable[[threading.Event], None]:
         if (
-            self._mode == "online" and (not self._config.server.url or not self._id)
+            self._mode == "online"
+            and (not self._user_config.server.url or not self._id)
         ) or not self._heartbeat_termination_trigger:
             raise RuntimeError("Could not commence heartbeat, run not initialised")
 
@@ -395,7 +396,7 @@ def _create_dispatch_callback(
         if self._mode == "online" and not self._id:
             raise RuntimeError("Expected identifier for run")
 
-        if not self._config.server.url:
+        if not self._user_config.server.url:
             raise RuntimeError("Cannot commence dispatch, run not initialised")
 
         def _offline_dispatch_callback(
@@ -404,7 +405,7 @@ def _offline_dispatch_callback(
             run_id: typing.Optional[str] = self._id,
             uuid: str = self._uuid,
         ) -> None:
-            _offline_directory = self._config.offline.cache
+            _offline_directory = self._user_config.offline.cache
             if not os.path.exists(_offline_directory):
                 logger.error(
                     f"Cannot write to offline directory '{_offline_directory}', directory not found."
@@ -431,7 +432,7 @@ def _offline_dispatch_callback(
         def _online_dispatch_callback(
             buffer: list[typing.Any],
             category: str,
-            url: str = self._config.server.url,
+            url: str = self._user_config.server.url,
             run_id: typing.Optional[str] = self._id,
             headers: dict[str, str] = self._headers,
         ) -> None:
@@ -634,11 +635,11 @@ def init(
             )
             return True
 
-        description = description or self._config.run.description
-        tags = (tags or []) + (self._config.run.tags or [])
-        folder = folder or self._config.run.folder
-        name = name or self._config.run.name
-        metadata = (metadata or {}) | (self._config.run.metadata or {})
+        description = description or self._user_config.run.description
+        tags = (tags or []) + (self._user_config.run.tags or [])
+        folder = folder or self._user_config.run.folder
+        name = name or self._user_config.run.name
+        metadata = (metadata or {}) | (self._user_config.run.metadata or {})
 
         self._term_color = not no_color
 
@@ -651,7 +652,7 @@ def init(
             self._error("invalid mode specified, must be online, offline or disabled")
             return False
 
-        if not self._config.server.token or not self._config.server.url:
+        if not self._user_config.server.token or not self._user_config.server.url:
             self._error(
                 "Unable to get URL and token from environment variables or config file"
             )
@@ -707,7 +708,7 @@ def init(
             name=self._name,
             uniq_id=self._uuid,
             mode=self._mode,
-            config=self._config,
+            config=self._user_config,
             suppress_errors=self._suppress_errors,
         )
         name, self._id = self._simvue.create_run(data)
@@ -730,7 +731,7 @@ def init(
                 fg="green" if self._term_color else None,
             )
             click.secho(
-                f"[simvue] Monitor in the UI at {self._config.server.url}/dashboard/runs/run/{self._id}",
+                f"[simvue] Monitor in the UI at {self._user_config.server.url}/dashboard/runs/run/{self._id}",
                 bold=self._term_color,
                 fg="green" if self._term_color else None,
             )
@@ -938,7 +939,7 @@ def reconnect(self, run_id: str) -> bool:
 
         self._id = run_id
         self._simvue = Simvue(
-            self._name, self._id, self._mode, self._config, self._suppress_errors
+            self._name, self._id, self._mode, self._user_config, self._suppress_errors
         )
         self._start(reconnect=True)