Skip to content

Commit 6e4d386

Browse files
Apply automated fixes from Ruff linter
1 parent a526075 commit 6e4d386

56 files changed

Lines changed: 367 additions & 392 deletions

Some content is hidden

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

setup.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,9 @@
11
import setuptools
22
import os
33

4-
version = os.environ['CONDUCTOR_PYTHON_VERSION']
4+
version = os.environ["CONDUCTOR_PYTHON_VERSION"]
55
if version is None:
6-
version = '0.0.0-SNAPSHOT'
6+
version = "0.0.0-SNAPSHOT"
77

88
setuptools.setup(
99
version=version,

src/conductor/__init__.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
__version__ = "1.1.10"
1+
__version__ = "1.1.10"

src/conductor/client/ai/integrations.py

Lines changed: 14 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -22,21 +22,21 @@ def __init__(self, api_key: str, endpoint: str, classname: str) -> None:
2222

2323
def to_dict(self) -> dict:
2424
return {
25-
'api_key': self.api_key,
26-
'endpoint': self.endpoint
25+
"api_key": self.api_key,
26+
"endpoint": self.endpoint
2727
}
2828

2929

3030
class OpenAIConfig(IntegrationConfig):
3131

3232
def __init__(self, api_key: str = None) -> None:
3333
if api_key is None:
34-
api_key = os.getenv('OPENAI_API_KEY')
34+
api_key = os.getenv("OPENAI_API_KEY")
3535
self.api_key = api_key
3636

3737
def to_dict(self) -> dict:
3838
return {
39-
'api_key': self.api_key
39+
"api_key": self.api_key
4040
}
4141

4242

@@ -48,38 +48,38 @@ def __init__(self, api_key: str, endpoint: str) -> None:
4848

4949
def to_dict(self) -> dict:
5050
return {
51-
'api_key': self.api_key,
52-
'endpoint': self.endpoint
51+
"api_key": self.api_key,
52+
"endpoint": self.endpoint
5353
}
5454

5555

5656
class PineconeConfig(IntegrationConfig):
5757

5858
def __init__(self, api_key: str = None, endpoint: str = None, environment: str = None, project_name: str = None) -> None:
5959
if api_key is None:
60-
self.api_key = os.getenv('PINECONE_API_KEY')
60+
self.api_key = os.getenv("PINECONE_API_KEY")
6161
else:
6262
self.api_key = api_key
6363

6464
if endpoint is None:
65-
self.endpoint = os.getenv('PINECONE_ENDPOINT')
65+
self.endpoint = os.getenv("PINECONE_ENDPOINT")
6666
else:
6767
self.endpoint = endpoint
6868

6969
if environment is None:
70-
self.environment = os.getenv('PINECONE_ENV')
70+
self.environment = os.getenv("PINECONE_ENV")
7171
else:
7272
self.environment = environment
7373

7474
if project_name is None:
75-
self.project_name = os.getenv('PINECONE_PROJECT')
75+
self.project_name = os.getenv("PINECONE_PROJECT")
7676
else:
7777
self.project_name = project_name
7878

7979
def to_dict(self) -> dict:
8080
return {
81-
'api_key': self.api_key,
82-
'endpoint': self.endpoint,
83-
'projectName': self.project_name,
84-
'environment': self.environment
81+
"api_key": self.api_key,
82+
"endpoint": self.endpoint,
83+
"projectName": self.project_name,
84+
"environment": self.environment
8585
}

src/conductor/client/ai/orchestrator.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@
1616

1717

1818
class AIOrchestrator:
19-
def __init__(self, api_configuration: Configuration, prompt_test_workflow_name: str = '') -> Self:
19+
def __init__(self, api_configuration: Configuration, prompt_test_workflow_name: str = "") -> Self:
2020
orkes_clients = OrkesClients(api_configuration)
2121

2222
self.integration_client = orkes_clients.get_integration_client()
@@ -25,8 +25,8 @@ def __init__(self, api_configuration: Configuration, prompt_test_workflow_name:
2525
self.prompt_client = orkes_clients.get_prompt_client()
2626

2727
self.prompt_test_workflow_name = prompt_test_workflow_name
28-
if self.prompt_test_workflow_name == '':
29-
self.prompt_test_workflow_name = 'prompt_test_' + str(uuid4())
28+
if self.prompt_test_workflow_name == "":
29+
self.prompt_test_workflow_name = "prompt_test_" + str(uuid4())
3030

3131
def add_prompt_template(self, name: str, prompt_template: str, description: str):
3232
self.prompt_client.save_prompt(name, description, prompt_template)
@@ -59,7 +59,7 @@ def add_ai_integration(self, ai_integration_name: str, provider: LLMProvider, mo
5959
details = IntegrationUpdate()
6060
details.configuration = config.to_dict()
6161
details.type = provider.value
62-
details.category = 'AI_MODEL'
62+
details.category = "AI_MODEL"
6363
details.enabled = True
6464
details.description = description
6565
existing_integration = self.integration_client.get_integration(integration_name=ai_integration_name)
@@ -78,7 +78,7 @@ def add_vector_store(self, db_integration_name: str, provider: VectorDB, indices
7878
vector_db = IntegrationUpdate()
7979
vector_db.configuration = config.to_dict()
8080
vector_db.type = provider.value
81-
vector_db.category = 'VECTOR_DB'
81+
vector_db.category = "VECTOR_DB"
8282
vector_db.enabled = True
8383
if description is None:
8484
description = db_integration_name
@@ -93,7 +93,6 @@ def add_vector_store(self, db_integration_name: str, provider: VectorDB, indices
9393
existing_integration_api = self.integration_client.get_integration_api(db_integration_name, index)
9494
if existing_integration_api is None or overwrite:
9595
self.integration_client.save_integration_api(db_integration_name, index, api_details)
96-
pass
9796

9897
def get_token_used(self, ai_integration: str) -> dict:
9998
return self.integration_client.get_token_usage_for_integration_provider(ai_integration)

src/conductor/client/automator/task_handler.py

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
import importlib
22
import logging
33
import os
4-
from multiprocessing import Process, freeze_support, Queue, set_start_method, get_context
4+
from multiprocessing import Process, freeze_support, Queue, set_start_method
55
from sys import platform
66
from typing import List
77

@@ -22,23 +22,23 @@
2222
_mp_fork_set = False
2323
if not _mp_fork_set:
2424
try:
25-
if platform == 'win32':
26-
set_start_method('spawn')
25+
if platform == "win32":
26+
set_start_method("spawn")
2727
else:
28-
set_start_method('fork')
28+
set_start_method("fork")
2929
_mp_fork_set = True
3030
except Exception as e:
31-
logger.info(f'error when setting multiprocessing.set_start_method - maybe the context is set {e.args}')
31+
logger.info(f"error when setting multiprocessing.set_start_method - maybe the context is set {e.args}")
3232
if platform == "darwin":
33-
os.environ['no_proxy'] = '*'
33+
os.environ["no_proxy"] = "*"
3434

3535
def register_decorated_fn(name: str, poll_interval: int, domain: str, worker_id: str, func):
36-
logger.info(f'decorated {name}')
36+
logger.info(f"decorated {name}")
3737
_decorated_functions[(name, domain)] = {
38-
'func': func,
39-
'poll_interval': poll_interval,
40-
'domain': domain,
41-
'worker_id': worker_id
38+
"func": func,
39+
"poll_interval": poll_interval,
40+
"domain": domain,
41+
"worker_id": worker_id
4242
}
4343

4444

@@ -54,11 +54,11 @@ def __init__(
5454
self.logger_process, self.queue = _setup_logging_queue(configuration)
5555

5656
# imports
57-
importlib.import_module('conductor.client.http.models.task')
58-
importlib.import_module('conductor.client.worker.worker_task')
57+
importlib.import_module("conductor.client.http.models.task")
58+
importlib.import_module("conductor.client.worker.worker_task")
5959
if import_modules is not None:
6060
for module in import_modules:
61-
logger.info(f'loading module {module}')
61+
logger.info(f"loading module {module}")
6262
importlib.import_module(module)
6363

6464
if workers is None:
@@ -68,22 +68,22 @@ def __init__(
6868
if scan_for_annotated_workers is True:
6969
for (task_def_name, domain) in _decorated_functions:
7070
record = _decorated_functions[(task_def_name, domain)]
71-
fn = record['func']
72-
worker_id = record['worker_id']
73-
poll_interval = record['poll_interval']
71+
fn = record["func"]
72+
worker_id = record["worker_id"]
73+
poll_interval = record["poll_interval"]
7474

7575
worker = Worker(
7676
task_definition_name=task_def_name,
7777
execute_function=fn,
7878
worker_id=worker_id,
7979
domain=domain,
8080
poll_interval=poll_interval)
81-
logger.info(f'created worker with name={task_def_name} and domain={domain}')
81+
logger.info(f"created worker with name={task_def_name} and domain={domain}")
8282
workers.append(worker)
8383

8484
self.__create_task_runner_processes(workers, configuration, metrics_settings)
8585
self.__create_metrics_provider_process(metrics_settings)
86-
logger.info('TaskHandler initialized')
86+
logger.info("TaskHandler initialized")
8787

8888
def __enter__(self):
8989
return self
@@ -94,24 +94,24 @@ def __exit__(self, exc_type, exc_value, traceback):
9494
def stop_processes(self) -> None:
9595
self.__stop_task_runner_processes()
9696
self.__stop_metrics_provider_process()
97-
logger.info('Stopped worker processes...')
97+
logger.info("Stopped worker processes...")
9898
self.queue.put(None)
9999
self.logger_process.terminate()
100100

101101
def start_processes(self) -> None:
102-
logger.info('Starting worker processes...')
102+
logger.info("Starting worker processes...")
103103
freeze_support()
104104
self.__start_task_runner_processes()
105105
self.__start_metrics_provider_process()
106-
logger.info('Started all processes')
106+
logger.info("Started all processes")
107107

108108
def join_processes(self) -> None:
109109
try:
110110
self.__join_task_runner_processes()
111111
self.__join_metrics_provider_process()
112-
logger.info('Joined all processes')
112+
logger.info("Joined all processes")
113113
except KeyboardInterrupt:
114-
logger.info('KeyboardInterrupt: Stopping all processes')
114+
logger.info("KeyboardInterrupt: Stopping all processes")
115115
self.stop_processes()
116116

117117
def __create_metrics_provider_process(self, metrics_settings: MetricsSettings) -> None:
@@ -122,7 +122,7 @@ def __create_metrics_provider_process(self, metrics_settings: MetricsSettings) -
122122
target=MetricsCollector.provide_metrics,
123123
args=(metrics_settings,)
124124
)
125-
logger.info('Created MetricsProvider process')
125+
logger.info("Created MetricsProvider process")
126126

127127
def __create_task_runner_processes(
128128
self,
@@ -150,25 +150,25 @@ def __start_metrics_provider_process(self):
150150
if self.metrics_provider_process is None:
151151
return
152152
self.metrics_provider_process.start()
153-
logger.info('Started MetricsProvider process')
153+
logger.info("Started MetricsProvider process")
154154

155155
def __start_task_runner_processes(self):
156156
n = 0
157157
for task_runner_process in self.task_runner_processes:
158158
task_runner_process.start()
159159
n = n + 1
160-
logger.info(f'Started {n} TaskRunner process')
160+
logger.info(f"Started {n} TaskRunner process")
161161

162162
def __join_metrics_provider_process(self):
163163
if self.metrics_provider_process is None:
164164
return
165165
self.metrics_provider_process.join()
166-
logger.info('Joined MetricsProvider processes')
166+
logger.info("Joined MetricsProvider processes")
167167

168168
def __join_task_runner_processes(self):
169169
for task_runner_process in self.task_runner_processes:
170170
task_runner_process.join()
171-
logger.info('Joined TaskRunner processes')
171+
logger.info("Joined TaskRunner processes")
172172

173173
def __stop_metrics_provider_process(self):
174174
self.__stop_process(self.metrics_provider_process)
@@ -181,12 +181,12 @@ def __stop_process(self, process: Process):
181181
if process is None:
182182
return
183183
try:
184-
logger.debug(f'Terminating process: {process.pid}')
184+
logger.debug(f"Terminating process: {process.pid}")
185185
process.terminate()
186186
except Exception as e:
187-
logger.debug(f'Failed to terminate process: {process.pid}, reason: {e}')
187+
logger.debug(f"Failed to terminate process: {process.pid}, reason: {e}")
188188
process.kill()
189-
logger.debug(f'Killed process: {process.pid}')
189+
logger.debug(f"Killed process: {process.pid}")
190190

191191

192192
# Setup centralized logging queue

0 commit comments

Comments
 (0)