Skip to content

Commit 3c348d1

Browse files
fix lint
1 parent 1497452 commit 3c348d1

File tree

9 files changed

+20
-29
lines changed

9 files changed

+20
-29
lines changed

model-engine/model_engine_server/common/io.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,7 @@ def open_wrapper(uri: str, mode: str = "rt", **kwargs):
3434
client_kwargs["endpoint_url"] = s3_endpoint
3535

3636
addressing_style = getattr(infra_config(), "s3_addressing_style", "path")
37-
client_kwargs["config"] = boto3.session.Config(
38-
s3={"addressing_style": addressing_style}
39-
)
37+
client_kwargs["config"] = boto3.session.Config(s3={"addressing_style": addressing_style})
4038

4139
client = session.client("s3", **client_kwargs)
4240
else:

model-engine/model_engine_server/core/celery/app.py

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -544,7 +544,9 @@ def _get_backend_url_and_conf(
544544
}
545545
)
546546
else:
547-
logger.info("Non-AWS deployment, using environment variables for S3 backend credentials")
547+
logger.info(
548+
"Non-AWS deployment, using environment variables for S3 backend credentials"
549+
)
548550
out_conf_changes.update(
549551
{
550552
"s3_bucket": s3_bucket,

model-engine/model_engine_server/domain/entities/model_bundle_entity.py

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,7 @@ def validate_fields_present_for_framework_type(cls, field_values):
7777
)
7878
if not field_values.get("ecr_repo"):
7979
from model_engine_server.core.config import infra_config
80+
8081
if infra_config().cloud_provider != "onprem":
8182
raise ValueError(
8283
"Expected `ecr_repo` to be non-null for custom framework. "

model-engine/model_engine_server/infra/gateways/resources/onprem_queue_endpoint_resource_delegate.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -30,9 +30,7 @@ async def create_queue_if_not_exists(
3030

3131
async def delete_queue(self, endpoint_id: str) -> None:
3232
queue_name = QueueEndpointResourceDelegate.endpoint_id_to_queue_name(endpoint_id)
33-
logger.debug(
34-
f"Delete request for queue {queue_name} (no-op for Redis-based queues)"
35-
)
33+
logger.debug(f"Delete request for queue {queue_name} (no-op for Redis-based queues)")
3634

3735
async def get_queue_attributes(self, endpoint_id: str) -> Dict[str, Any]:
3836
queue_name = QueueEndpointResourceDelegate.endpoint_id_to_queue_name(endpoint_id)

model-engine/model_engine_server/infra/gateways/s3_file_storage_gateway.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -93,7 +93,7 @@ async def list_files(self, owner: str) -> List[FileMetadata]:
9393
for obj in objects.get("Contents", []):
9494
key = obj["Key"]
9595
if key.startswith(owner):
96-
file_id = key[len(owner):].lstrip("/")
96+
file_id = key[len(owner) :].lstrip("/")
9797
if file_id:
9898
file_metadata = await self.get_file(owner, file_id)
9999
if file_metadata:

model-engine/model_engine_server/infra/gateways/s3_llm_artifact_gateway.py

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -23,9 +23,7 @@ def list_files(self, path: str, **kwargs) -> List[str]:
2323
logger.debug(f"Listed {len(files)} files from {path}")
2424
return files
2525

26-
def download_files(
27-
self, path: str, target_path: str, overwrite=False, **kwargs
28-
) -> List[str]:
26+
def download_files(self, path: str, target_path: str, overwrite=False, **kwargs) -> List[str]:
2927
s3 = get_s3_resource(kwargs)
3028
parsed_remote = parse_attachment_url(path, clean_key=False)
3129
bucket = parsed_remote.bucket

model-engine/model_engine_server/infra/gateways/s3_utils.py

Lines changed: 10 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -12,54 +12,49 @@ def get_s3_client(kwargs: Optional[Dict[str, Any]] = None):
1212
kwargs = kwargs or {}
1313
session = boto3.Session()
1414
client_kwargs = {}
15-
15+
1616
if infra_config().cloud_provider == "onprem":
1717
logger.debug("Using on-prem/MinIO S3-compatible configuration")
18-
18+
1919
s3_endpoint = getattr(infra_config(), "s3_endpoint_url", None) or os.getenv(
2020
"S3_ENDPOINT_URL"
2121
)
2222
if s3_endpoint:
2323
client_kwargs["endpoint_url"] = s3_endpoint
2424
logger.debug(f"Using S3 endpoint: {s3_endpoint}")
25-
25+
2626
addressing_style = getattr(infra_config(), "s3_addressing_style", "path")
27-
client_kwargs["config"] = boto3.session.Config(
28-
s3={"addressing_style": addressing_style}
29-
)
27+
client_kwargs["config"] = boto3.session.Config(s3={"addressing_style": addressing_style})
3028
else:
3129
logger.debug("Using AWS S3 configuration")
3230
aws_profile = kwargs.get("aws_profile")
3331
if aws_profile:
3432
session = boto3.Session(profile_name=aws_profile)
35-
33+
3634
return session.client("s3", **client_kwargs)
3735

3836

3937
def get_s3_resource(kwargs: Optional[Dict[str, Any]] = None):
4038
kwargs = kwargs or {}
4139
session = boto3.Session()
4240
resource_kwargs = {}
43-
41+
4442
if infra_config().cloud_provider == "onprem":
4543
logger.debug("Using on-prem/MinIO S3-compatible configuration")
46-
44+
4745
s3_endpoint = getattr(infra_config(), "s3_endpoint_url", None) or os.getenv(
4846
"S3_ENDPOINT_URL"
4947
)
5048
if s3_endpoint:
5149
resource_kwargs["endpoint_url"] = s3_endpoint
5250
logger.debug(f"Using S3 endpoint: {s3_endpoint}")
53-
51+
5452
addressing_style = getattr(infra_config(), "s3_addressing_style", "path")
55-
resource_kwargs["config"] = boto3.session.Config(
56-
s3={"addressing_style": addressing_style}
57-
)
53+
resource_kwargs["config"] = boto3.session.Config(s3={"addressing_style": addressing_style})
5854
else:
5955
logger.debug("Using AWS S3 configuration")
6056
aws_profile = kwargs.get("aws_profile")
6157
if aws_profile:
6258
session = boto3.Session(profile_name=aws_profile)
63-
64-
return session.resource("s3", **resource_kwargs)
6559

60+
return session.resource("s3", **resource_kwargs)

model-engine/model_engine_server/infra/repositories/s3_file_llm_fine_tune_repository.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ def _open(self, uri: str, mode: str = "rt", **kwargs) -> IO:
2222

2323
@staticmethod
2424
def _get_key(model_name: str, fine_tuning_method: str) -> str:
25-
return f"{model_name}-{fine_tuning_method}" # possible for collisions but we control these names
25+
return f"{model_name}-{fine_tuning_method}" # possible for collisions but we control these names
2626

2727
async def get_job_template_for_model(
2828
self, model_name: str, fine_tuning_method: str

model-engine/model_engine_server/infra/services/live_endpoint_builder_service.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -251,8 +251,7 @@ async def build_endpoint(
251251
flavor = model_bundle.flavor
252252
assert isinstance(flavor, RunnableImageLike)
253253
image = self.docker_repository.get_image_url(
254-
image_tag=flavor.tag,
255-
repository_name=flavor.repository
254+
image_tag=flavor.tag, repository_name=flavor.repository
256255
)
257256

258257
# Because this update is not the final update in the lock, the 'update_in_progress'

0 commit comments

Comments
 (0)