Skip to content

Commit 7159f48

Browse files
Lint fixes for RUF013 and FA100 errors (#309)
1 parent 47ab73a commit 7159f48

47 files changed

Lines changed: 259 additions & 172 deletions

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.pre-commit-config.yaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,4 +3,4 @@ repos:
33
rev: v0.12.3
44
hooks:
55
- id: ruff
6-
args: [""]
6+
args: ["--exit-zero"]

src/conductor/client/ai/integrations.py

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
import os
44
from abc import ABC, abstractmethod
5-
5+
from typing import Optional
66

77
class IntegrationConfig(ABC):
88
def __init__(self):
@@ -29,7 +29,7 @@ def to_dict(self) -> dict:
2929

3030
class OpenAIConfig(IntegrationConfig):
3131

32-
def __init__(self, api_key: str = None) -> None:
32+
def __init__(self, api_key: Optional[str] = None) -> None:
3333
if api_key is None:
3434
api_key = os.getenv('OPENAI_API_KEY')
3535
self.api_key = api_key
@@ -55,7 +55,7 @@ def to_dict(self) -> dict:
5555

5656
class PineconeConfig(IntegrationConfig):
5757

58-
def __init__(self, api_key: str = None, endpoint: str = None, environment: str = None, project_name: str = None) -> None:
58+
def __init__(self, api_key: Optional[str] = None, endpoint: Optional[str] = None, environment: Optional[str] = None, project_name: Optional[str] = None) -> None:
5959
if api_key is None:
6060
self.api_key = os.getenv('PINECONE_API_KEY')
6161
else:

src/conductor/client/ai/orchestrator.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -73,8 +73,8 @@ def add_ai_integration(self, ai_integration_name: str, provider: LLMProvider, mo
7373
if existing_integration_api is None or overwrite:
7474
self.integration_client.save_integration_api(ai_integration_name, model, api_details)
7575

76-
def add_vector_store(self, db_integration_name: str, provider: VectorDB, indices: List[str],config: IntegrationConfig,
77-
description: str = None,overwrite : bool = False):
76+
def add_vector_store(self, db_integration_name: str, provider: VectorDB, indices: List[str], config: IntegrationConfig,
77+
description: Optional[str] = None, overwrite: bool = False):
7878
vector_db = IntegrationUpdate()
7979
vector_db.configuration = config.to_dict()
8080
vector_db.type = provider.value

src/conductor/client/authorization_client.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
from __future__ import annotations
12
from abc import ABC, abstractmethod
23
from typing import Dict, List, Optional
34
from conductor.client.orkes.models.metadata_tag import MetadataTag

src/conductor/client/automator/task_handler.py

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1+
from __future__ import annotations
12
import importlib
23
import logging
34
import os
45
from multiprocessing import Process, freeze_support, Queue, set_start_method, get_context
56
from sys import platform
6-
from typing import List
7+
from typing import List, Optional
78

89
from conductor.client.automator.task_runner import TaskRunner
910
from conductor.client.configuration.configuration import Configuration
@@ -46,10 +47,10 @@ class TaskHandler:
4647
def __init__(
4748
self,
4849
workers: List[WorkerInterface] = [],
49-
configuration: Configuration = None,
50-
metrics_settings: MetricsSettings = None,
50+
configuration: Optional[Configuration] = None,
51+
metrics_settings: Optional[MetricsSettings] = None,
5152
scan_for_annotated_workers: bool = True,
52-
import_modules: List[str] = None
53+
import_modules: Optional[List[str]] = None
5354
):
5455
self.logger_process, self.queue = _setup_logging_queue(configuration)
5556

src/conductor/client/automator/utils.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
from __future__ import annotations
12
import dataclasses
23
import datetime
34
import inspect

src/conductor/client/configuration/configuration.py

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
1+
from __future__ import annotations
12
import logging
23
import os
34
import time
5+
from typing import Optional
46

57
from conductor.client.configuration.settings.authentication_settings import AuthenticationSettings
68

@@ -10,10 +12,10 @@ class Configuration:
1012

1113
def __init__(
1214
self,
13-
base_url: str = None,
15+
base_url: Optional[str] = None,
1416
debug: bool = False,
1517
authentication_settings: AuthenticationSettings = None,
16-
server_api_url: str = None,
18+
server_api_url: Optional[str] = None,
1719
auth_token_ttl_min: int = 45
1820
):
1921
if server_api_url is not None:
@@ -138,7 +140,7 @@ def ui_host(self):
138140
"""
139141
return self.__ui_host
140142

141-
def apply_logging_config(self, log_format : str = None, level = None):
143+
def apply_logging_config(self, log_format : Optional[str] = None, level = None):
142144
if log_format is None:
143145
log_format = self.logger_format
144146
if level is None:

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

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
1+
from __future__ import annotations
12
import logging
23
import os
4+
from typing import Optional
35
from pathlib import Path
46

57
from conductor.client.configuration.configuration import Configuration
@@ -18,7 +20,7 @@ def get_default_temporary_folder() -> str:
1820
class MetricsSettings:
1921
def __init__(
2022
self,
21-
directory: str = None,
23+
directory: Optional[str] = None,
2224
file_name: str = 'metrics.log',
2325
update_interval: float = 0.1):
2426
if directory is None:

src/conductor/client/metadata_client.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
from __future__ import annotations
12
from abc import ABC, abstractmethod
23
from typing import Optional, List
34
from conductor.client.http.models.workflow_def import WorkflowDef

src/conductor/client/orkes/orkes_authorization_client.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,4 @@
1+
from __future__ import annotations
12
from typing import Dict, List, Optional
23

34
from conductor.client.authorization_client import AuthorizationClient

0 commit comments

Comments
 (0)