Refactoring

Author: IgorChvyrov-sm

src/conductor/asyncio_client/automator/task_runner.py

@@ -241,12 +241,8 @@ def __set_worker_properties(self) -> None:
             self.worker.domain = self.worker.get_domain()
 
         polling_interval = self.__get_property_value_from_env(
-            "poll_interval", task_type
+            "polling_interval", task_type
         )
-        if not polling_interval:
-            polling_interval = self.__get_property_value_from_env(
-                "polling_interval", task_type
-            )
 
         if polling_interval:
             try:

src/conductor/asyncio_client/configuration/configuration.py

@@ -58,9 +58,9 @@ def __init__(
         auth_secret: Optional[str] = None,
         debug: bool = False,
         # Worker properties
-        poll_interval: Optional[int] = None,
+        polling_interval: Optional[int] = None,
         domain: Optional[str] = None,
-        poll_interval_seconds: Optional[int] = None,
+        polling_interval_seconds: Optional[int] = None,
         # HTTP Configuration parameters
         api_key: Optional[Dict[str, str]] = None,
         api_key_prefix: Optional[Dict[str, str]] = None,
@@ -90,11 +90,11 @@ def __init__(
             Authentication key secret. If not provided, reads from CONDUCTOR_AUTH_SECRET env var.
         debug : bool, optional
             Enable debug logging. Default is False.
-        poll_interval : int, optional
+        polling_interval : int, optional
             Polling interval in milliseconds. If not provided, reads from CONDUCTOR_WORKER_POLL_INTERVAL env var.
         domain : str, optional
             Worker domain. If not provided, reads from CONDUCTOR_WORKER_DOMAIN env var.
-        poll_interval_seconds : int, optional
+        polling_interval_seconds : int, optional
             Polling interval in seconds. If not provided, reads from CONDUCTOR_WORKER_POLL_INTERVAL_SECONDS env var.
         **kwargs : Any
             Additional parameters passed to HttpConfiguration.
@@ -121,11 +121,11 @@ def __init__(
             self.auth_secret = os.getenv("CONDUCTOR_AUTH_SECRET")
 
         # Additional worker properties with environment variable fallback
-        self.poll_interval = poll_interval or self._get_env_int(
+        self.poll_interval = polling_interval or self._get_env_int(
             "CONDUCTOR_WORKER_POLL_INTERVAL", 100
         )
         self.domain = domain or os.getenv("CONDUCTOR_WORKER_DOMAIN", "default_domain")
-        self.poll_interval_seconds = poll_interval_seconds or self._get_env_int(
+        self.poll_interval_seconds = polling_interval_seconds or self._get_env_int(
             "CONDUCTOR_WORKER_POLL_INTERVAL_SECONDS", 0
         )
 
@@ -243,10 +243,10 @@ def get_worker_property_value(
         # Return default value
         elif property_name == "domain":
             return self.domain
-        elif property_name == "poll_interval":
-            return self.poll_interval
+        elif property_name == "polling_interval":
+            return self.polling_interval
         elif property_name == "poll_interval_seconds":
-            return self.poll_interval_seconds
+            return self.polling_interval_seconds
 
         return None
 
@@ -256,14 +256,14 @@ def _convert_property_value(self, property_name: str, value: str) -> Any:
             try:
                 return float(value)
             except (ValueError, TypeError):
-                self.logger.warning("Invalid poll_interval value: %s", value)
-                return self.poll_interval
-        elif property_name == "poll_interval_seconds":
+                self.logger.warning("Invalid polling_interval value: %s", value)
+                return self.polling_interval
+        elif property_name == "polling_interval_seconds":
             try:
                 return float(value)
             except (ValueError, TypeError):
-                self.logger.warning("Invalid poll_interval_seconds value: %s", value)
-                return self.poll_interval_seconds
+                self.logger.warning("Invalid polling_interval_seconds value: %s", value)
+                return self.polling_interval_seconds
 
         # For other properties, return as string
         return value
@@ -355,10 +355,10 @@ def get_poll_interval(self, task_type: Optional[str] = None) -> int:
             Polling interval in milliseconds
         """
         if task_type:
-            value = self.get_worker_property_value("poll_interval", task_type)
+            value = self.get_worker_property_value("polling_interval", task_type)
             if value is not None:
                 return int(value)
-        return self.poll_interval
+        return self.polling_interval
 
     def get_poll_interval_seconds(self) -> int:
         """
@@ -369,7 +369,7 @@ def get_poll_interval_seconds(self) -> int:
         int
             Polling interval in seconds
         """
-        return self.poll_interval_seconds
+        return self.polling_interval_seconds
 
     # Properties for commonly used HTTP configuration attributes
     @property

src/conductor/client/automator/task_runner.py

@@ -242,12 +242,8 @@ def __set_worker_properties(self) -> None:
             self.worker.domain = self.worker.get_domain()
 
         polling_interval = self.__get_property_value_from_env(
-            "poll_interval", task_type
+            "polling_interval", task_type
         )
-        if not polling_interval:
-            polling_interval = self.__get_property_value_from_env(
-                "polling_interval", task_type
-            )
 
         if polling_interval:
             try:

src/conductor/client/configuration/configuration.py

@@ -20,9 +20,9 @@ def __init__(
         authentication_settings: AuthenticationSettings = None,
         server_api_url: Optional[str] = None,
         auth_token_ttl_min: int = 45,
-        poll_interval: Optional[float] = None,
+        polling_interval: Optional[float] = None,
         domain: Optional[str] = None,
-        poll_interval_seconds: Optional[float] = None,
+        polling_interval_seconds: Optional[float] = None,
     ):
         if server_api_url is not None:
             self.host = server_api_url
@@ -83,11 +83,11 @@ def __init__(
         self.auth_token_ttl_msec = auth_token_ttl_min * 60 * 1000
 
         # Worker properties
-        self.poll_interval = poll_interval or self._get_env_float(
+        self.polling_interval = polling_interval or self._get_env_float(
             "CONDUCTOR_WORKER_POLL_INTERVAL", 100
         )
         self.domain = domain or os.getenv("CONDUCTOR_WORKER_DOMAIN", "default_domain")
-        self.poll_interval_seconds = poll_interval_seconds or self._get_env_float(
+        self.polling_interval_seconds = polling_interval_seconds or self._get_env_float(
             "CONDUCTOR_WORKER_POLL_INTERVAL_SECONDS", 0
         )
 
@@ -186,10 +186,10 @@ def _get_env_float(self, env_var: str, default: float) -> float:
         return default
 
     def get_poll_interval_seconds(self):
-        return self.poll_interval_seconds
+        return self.polling_interval_seconds
 
     def get_poll_interval(self):
-        return self.poll_interval
+        return self.polling_interval
 
     def get_domain(self):
         return self.domain