Lint fixes for PLR, PLW, PLC, PUI and TC errors (#312)

Author: IgorChvyrov-sm

poetry.lock

@@ -33,6 +33,7 @@ astor = ">=0.8.1"
 shortuuid = ">=1.0.11"
 dacite = ">=1.8.1"
 deprecated = ">=1.2.14"
+python-dateutil = "^2.8.2"
 
 [tool.poetry.group.dev.dependencies]
 pylint = ">=2.17.5"
@@ -120,6 +121,14 @@ ignore = [
     "W191",
     "E501",
     "B011",
+    # too-many-arguments
+    "PLR0913",
+    # collapsible-else-if
+    "PLR5501",
+    # too-many-branches
+    "PLR0912",
+    # too-many-return-statements
+    "PLR0911"
 ]
 
 [tool.ruff.lint.isort]

pyproject.toml

@@ -1,19 +1,22 @@
 from __future__ import annotations
 
-from typing import Optional, List
+from typing import Optional, List, TYPE_CHECKING
 from uuid import uuid4
 
 from typing_extensions import Self
 
-from conductor.client.ai.configuration import LLMProvider, VectorDB
-from conductor.client.ai.integrations import IntegrationConfig
-from conductor.client.configuration.configuration import Configuration
 from conductor.client.http.models.integration_api_update import IntegrationApiUpdate
 from conductor.client.http.models.integration_update import IntegrationUpdate
-from conductor.client.http.models.prompt_template import PromptTemplate
 from conductor.client.http.rest import ApiException
 from conductor.client.orkes_clients import OrkesClients
 
+if TYPE_CHECKING:
+    from conductor.client.http.models.prompt_template import PromptTemplate
+    from conductor.client.configuration.configuration import Configuration
+    from conductor.client.ai.integrations import IntegrationConfig
+    from conductor.client.ai.configuration import LLMProvider, VectorDB
+
+NOT_FOUND_STATUS = 404
 
 class AIOrchestrator:
     def __init__(self, api_configuration: Configuration, prompt_test_workflow_name: str = '') -> Self:
@@ -36,7 +39,7 @@ def get_prompt_template(self, template_name: str) -> PromptTemplate:
         try:
             return self.prompt_client.get_prompt(template_name)
         except ApiException as e:
-            if e.code == 404:
+            if e.code == NOT_FOUND_STATUS:
                 return None
             raise e
 
@@ -93,7 +96,6 @@ def add_vector_store(self, db_integration_name: str, provider: VectorDB, indices
             existing_integration_api = self.integration_client.get_integration_api(db_integration_name, index)
             if existing_integration_api is None or overwrite:
                 self.integration_client.save_integration_api(db_integration_name, index, api_details)
-        pass
 
     def get_token_used(self, ai_integration: str) -> dict:
         return self.integration_client.get_token_usage_for_integration_provider(ai_integration)

src/conductor/client/ai/orchestrator.py

@@ -66,8 +66,7 @@ def __init__(
         elif not isinstance(workers, list):
             workers = [workers]
         if scan_for_annotated_workers is True:
-            for (task_def_name, domain) in _decorated_functions:
-                record = _decorated_functions[(task_def_name, domain)]
+            for (task_def_name, domain), record in _decorated_functions.items():
                 fn = record['func']
                 worker_id = record['worker_id']
                 poll_interval = record['poll_interval']

src/conductor/client/automator/task_handler.py

@@ -109,10 +109,7 @@ def get_value(typ: type, val: object) -> object:
     if typ in simple_types:
         return val
     elif str(typ).startswith('typing.List[') or str(typ).startswith('typing.Set[') or str(typ).startswith('list['):
-        values = []
-        for item in val:
-            converted = get_value(type(item), item)
-            values.append(converted)
+        values = [get_value(type(item), item) for item in val]
         return values
     elif str(typ).startswith('dict[') or str(typ).startswith(
             'typing.Dict[') or str(typ).startswith('requests.structures.CaseInsensitiveDict[') or typ is dict:

src/conductor/client/automator/utils.py

@@ -35,5 +35,5 @@ def __set_dir(self, dir: str) -> None:
                 os.mkdir(dir)
             except Exception as e:
                 logger.warning(
-                    'Failed to create metrics temporary folder, reason: ', e)
+                    'Failed to create metrics temporary folder, reason: %s', e)
         self.directory = dir

src/conductor/client/configuration/settings/metrics_settings.py

@@ -3,12 +3,18 @@
 from conductor.client.exceptions.api_error import APIError, APIErrorCode
 from conductor.client.http.rest import ApiException
 
+BAD_REQUEST_STATUS = 400
+FORBIDDEN_STATUS = 403
+NOT_FOUND_STATUS = 404
+REQUEST_TIMEOUT_STATUS = 408
+CONFLICT_STATUS = 409
+
 STATUS_TO_MESSAGE_DEFAULT_MAPPING = {
-    400: "Invalid request",
-    403: "Access forbidden",
-    404: "Resource not found",
-    408: "Request timed out",
-    409: "Resource exists already",
+    BAD_REQUEST_STATUS: "Invalid request",
+    FORBIDDEN_STATUS: "Access forbidden",
+    NOT_FOUND_STATUS: "Resource not found",
+    REQUEST_TIMEOUT_STATUS: "Request timed out",
+    CONFLICT_STATUS: "Resource exists already",
 }
 
 
@@ -18,20 +24,20 @@ def inner_function(*args, **kwargs):
             return function(*args, **kwargs)
         except ApiException as e:
 
-            if e.status == 404:
+            if e.status == NOT_FOUND_STATUS:
                 code = APIErrorCode.NOT_FOUND
-            elif e.status == 403:
+            elif e.status == FORBIDDEN_STATUS:
                 code = APIErrorCode.FORBIDDEN
-            elif e.status == 409:
+            elif e.status == CONFLICT_STATUS:
                 code = APIErrorCode.CONFLICT
-            elif e.status == 400:
+            elif e.status == BAD_REQUEST_STATUS:
                 code = APIErrorCode.BAD_REQUEST
-            elif e.status == 408:
+            elif e.status == REQUEST_TIMEOUT_STATUS:
                 code = APIErrorCode.REQUEST_TIMEOUT
             else:
                 code = APIErrorCode.UNKNOWN
 
-            message = STATUS_TO_MESSAGE_DEFAULT_MAPPING[e.status]
+            message = STATUS_TO_MESSAGE_DEFAULT_MAPPING.get(e.status, "Unknown error")
 
             try:
                 if e.body:

src/conductor/client/exceptions/api_exception_handler.py

@@ -1,6 +1,7 @@
 import datetime
 import logging
 import re
+from dateutil.parser import parse
 from typing import Any, ClassVar, Dict, Tuple
 
 import six
@@ -21,7 +22,7 @@ class ObjectMapper(object):
     PRIMITIVE_TYPES: ClassVar[Tuple[Any, ...]] = (float, bool, bytes, six.text_type, *six.integer_types)
     NATIVE_TYPES_MAPPING: ClassVar[Dict[str, Any]] = {
         'int': int,
-        'long': int if six.PY3 else long,  # noqa: F821, RUF100
+        'long': int if six.PY3 else long,  # noqa: F821, RUF100, YTT202
         'float': float,
         'str': str,
         'bool': bool,
@@ -31,39 +32,29 @@ class ObjectMapper(object):
     }
 
     def to_json(self, obj):
-
         if obj is None:
             return None
         elif isinstance(obj, self.PRIMITIVE_TYPES):
             return obj
         elif isinstance(obj, list):
-            return [self.to_json(sub_obj)
-                    for sub_obj in obj]
+            return [self.to_json(sub_obj) for sub_obj in obj]
         elif isinstance(obj, tuple):
-            return tuple(self.to_json(sub_obj)
-                         for sub_obj in obj)
+            return tuple(self.to_json(sub_obj) for sub_obj in obj)
         elif isinstance(obj, (datetime.datetime, datetime.date)):
             return obj.isoformat()
-
-        if isinstance(obj, dict) or isinstance(obj, CaseInsensitiveDict):
+        elif isinstance(obj, dict) or isinstance(obj, CaseInsensitiveDict):
             obj_dict = obj
+        elif hasattr(obj, 'attribute_map') and hasattr(obj, 'swagger_types'):
+            obj_dict = {obj.attribute_map[attr]: getattr(obj, attr)
+                    for attr, _ in six.iteritems(obj.swagger_types)
+                    if getattr(obj, attr) is not None}
         else:
-            # Convert model obj to dict except
-            # attributes `swagger_types`, `attribute_map`
-            # and attributes which value is not None.
-            # Convert attribute name to json key in
-            # model definition for request.
-            if hasattr(obj, 'attribute_map') and hasattr(obj, 'swagger_types'):
-                obj_dict = {obj.attribute_map[attr]: getattr(obj, attr)
-                            for attr, _ in six.iteritems(obj.swagger_types)
-                            if getattr(obj, attr) is not None}
-            else:
-                obj_dict = {name: getattr(obj, name)
-                            for name in vars(obj)
-                            if getattr(obj, name) is not None}
+            obj_dict = {name: getattr(obj, name)
+                    for name in vars(obj)
+                    if getattr(obj, name) is not None}
 
         return {key: self.to_json(val)
-                for key, val in six.iteritems(obj_dict)}
+            for key, val in six.iteritems(obj_dict)}
 
     def from_json(self, data, klass):
         return self.__deserialize(data, klass)
@@ -134,7 +125,6 @@ def __deserialize_date(self, string):
         :return: date.
         """
         try:
-            from dateutil.parser import parse
             return parse(string).date()
         except ImportError:
             return string
@@ -153,7 +143,6 @@ def __deserialize_datatime(self, string):
         :return: datetime.
         """
         try:
-            from dateutil.parser import parse
             return parse(string)
         except ImportError:
             return string

src/conductor/client/helpers/helper.py

@@ -35,82 +35,82 @@ class IntegrationClient(ABC):
     @abstractmethod
     def associate_prompt_with_integration(self, ai_integration:str, model_name:str, prompt_name:str):
         """Associate a prompt with an AI integration and model"""
-        pass
+        ...
 
     @abstractmethod
     def delete_integration_api(self, api_name:str, integration_name:str):
         """Delete a specific integration api for a given integration"""
-        pass
+        ...
 
     @abstractmethod
     def delete_integration(self, integration_name:str):
         """Delete an integration"""
-        pass
+
 
     @abstractmethod
     def get_integration_api(self, api_name:str, integration_name:str) -> IntegrationApi:
-        pass
+        ...
 
     @abstractmethod
     def get_integration_apis(self, integration_name:str) -> List[IntegrationApi]:
-        pass
+        ...
 
     @abstractmethod
     def get_integration(self, integration_name:str) -> Integration:
-        pass
+        ...
 
     @abstractmethod
     def get_integrations(self) -> List[Integration]:
         """Returns the list of all the available integrations"""
-        pass
+
 
     @abstractmethod
     def get_prompts_with_integration(self, ai_integration:str, model_name:str) -> List[PromptTemplate]:
-        pass
+        ...
 
     @abstractmethod
     def get_token_usage_for_integration(self, name, integration_name) -> int:
-        pass
+        ...
 
     @abstractmethod
     def get_token_usage_for_integration_provider(self, name) -> dict:
-        pass
+        ...
 
     @abstractmethod
     def register_token_usage(self, body, name, integration_name):
-        pass
+        ...
 
     @abstractmethod
     def save_integration_api(self, integration_name, api_name, api_details: IntegrationApiUpdate):
-        pass
+        ...
 
     @abstractmethod
     def save_integration(self, integration_name, integration_details: IntegrationUpdate):
-        pass
+        ...
 
     # Tags
 
     @abstractmethod
     def delete_tag_for_integration(self, body, tag_name, integration_name):
         """Delete an integration"""
-        pass
+
 
     @abstractmethod
     def delete_tag_for_integration_provider(self, body, name):
-        pass
+        ...
 
     @abstractmethod
     def put_tag_for_integration(self, body, name, integration_name):
-        pass
+        ...
 
     @abstractmethod
     def put_tag_for_integration_provider(self, body, name):
-        pass
+        ...
 
     @abstractmethod
     def get_tags_for_integration(self, name, integration_name):
-        pass
+        ...
 
     @abstractmethod
     def get_tags_for_integration_provider(self, name):
-        pass
+        ...

src/conductor/client/integration_client.py

@@ -3,7 +3,7 @@
 from conductor.client.orkes.models.access_key_status import AccessKeyStatus
 
 
-class AccessKey:
+class AccessKey:  # noqa: PLW1641
     def __init__(self, id: str, status: AccessKeyStatus, created_at: int) -> Self:
         self._id = id
         self._status = status