From fa14ae8c05b6d760153073e1075fd5c8992c77c5 Mon Sep 17 00:00:00 2001
From: Aiden Dai <daixb@amazon.com>
Date: Thu, 13 Mar 2025 14:24:41 +0800
Subject: [PATCH] apply ruff linter

---
 .pre-commit-config.yaml       |  1 +
 ruff.toml                     |  4 +---
 src/api/app.py                |  5 +++--
 src/api/models/base.py        |  2 +-
 src/api/models/bedrock.py     | 34 ++++++++++++++++------------------
 src/api/routers/chat.py       |  2 +-
 src/api/routers/embeddings.py |  2 +-
 src/api/routers/model.py      |  2 +-
 src/api/schema.py             |  2 +-
 9 files changed, 26 insertions(+), 28 deletions(-)

diff --git a/.pre-commit-config.yaml b/.pre-commit-config.yaml
index 3c8cb89..367b1c6 100644
--- a/.pre-commit-config.yaml
+++ b/.pre-commit-config.yaml
@@ -5,5 +5,6 @@ repos:
     hooks:
       # Run the linter.
       - id: ruff
+        types_or: [python, pyi]
       # Run the formatter.
       - id: ruff-format
diff --git a/ruff.toml b/ruff.toml
index dd77d11..c67aba7 100644
--- a/ruff.toml
+++ b/ruff.toml
@@ -9,13 +9,11 @@ exclude = [
 ]
 
 [lint]
-select = ["E", "F"]
+select = ["E", "F", "I"]
 ignore = [
     "E501",
-    "B008",
     "C901",
     "F401",
-    "W191",
 ]
 
 [format]
diff --git a/src/api/app.py b/src/api/app.py
index 7fa2f01..49a0519 100644
--- a/src/api/app.py
+++ b/src/api/app.py
@@ -7,8 +7,8 @@ from fastapi.middleware.cors import CORSMiddleware
 from fastapi.responses import PlainTextResponse
 from mangum import Mangum
 
-from api.routers import model, chat, embeddings
-from api.setting import API_ROUTE_PREFIX, TITLE, DESCRIPTION, SUMMARY, VERSION
+from api.routers import chat, embeddings, model
+from api.setting import API_ROUTE_PREFIX, DESCRIPTION, SUMMARY, TITLE, VERSION
 
 config = {
     "title": TITLE,
@@ -31,6 +31,7 @@ app.add_middleware(
     allow_headers=["*"],
 )
 
+
 app.include_router(model.router, prefix=API_ROUTE_PREFIX)
 app.include_router(chat.router, prefix=API_ROUTE_PREFIX)
 app.include_router(embeddings.router, prefix=API_ROUTE_PREFIX)
diff --git a/src/api/models/base.py b/src/api/models/base.py
index 659fdff..fb9c27c 100644
--- a/src/api/models/base.py
+++ b/src/api/models/base.py
@@ -5,8 +5,8 @@ from typing import AsyncIterable
 
 from api.schema import (
     # Chat
-    ChatResponse,
     ChatRequest,
+    ChatResponse,
     ChatStreamResponse,
     # Embeddings
     EmbeddingsRequest,
diff --git a/src/api/models/bedrock.py b/src/api/models/bedrock.py
index 7a35157..9c5802c 100644
--- a/src/api/models/bedrock.py
+++ b/src/api/models/bedrock.py
@@ -15,29 +15,27 @@ from fastapi import HTTPException
 
 from api.models.base import BaseChatModel, BaseEmbeddingsModel
 from api.schema import (
-    # Chat
-    ChatResponse,
-    ChatRequest,
-    Choice,
-    ChatResponseMessage,
-    Usage,
-    ChatStreamResponse,
-    ImageContent,
-    TextContent,
-    ToolCall,
-    ChoiceDelta,
-    UserMessage,
     AssistantMessage,
-    ToolMessage,
-    Function,
-    ResponseFunction,
-    # Embeddings
+    ChatRequest,
+    ChatResponse,
+    ChatResponseMessage,
+    ChatStreamResponse,
+    Choice,
+    ChoiceDelta,
+    Embedding,
     EmbeddingsRequest,
     EmbeddingsResponse,
     EmbeddingsUsage,
-    Embedding,
+    Function,
+    ImageContent,
+    ResponseFunction,
+    TextContent,
+    ToolCall,
+    ToolMessage,
+    Usage,
+    UserMessage,
 )
-from api.setting import DEBUG, AWS_REGION, ENABLE_CROSS_REGION_INFERENCE, DEFAULT_MODEL
+from api.setting import AWS_REGION, DEBUG, DEFAULT_MODEL, ENABLE_CROSS_REGION_INFERENCE
 
 logger = logging.getLogger(__name__)
 
diff --git a/src/api/routers/chat.py b/src/api/routers/chat.py
index aa200bf..800b3c9 100644
--- a/src/api/routers/chat.py
+++ b/src/api/routers/chat.py
@@ -1,6 +1,6 @@
 from typing import Annotated
 
-from fastapi import APIRouter, Depends, Body
+from fastapi import APIRouter, Body, Depends
 from fastapi.responses import StreamingResponse
 
 from api.auth import api_key_auth
diff --git a/src/api/routers/embeddings.py b/src/api/routers/embeddings.py
index 1ccf627..55dcf34 100644
--- a/src/api/routers/embeddings.py
+++ b/src/api/routers/embeddings.py
@@ -1,6 +1,6 @@
 from typing import Annotated
 
-from fastapi import APIRouter, Depends, Body
+from fastapi import APIRouter, Body, Depends
 
 from api.auth import api_key_auth
 from api.models.bedrock import get_embeddings_model
diff --git a/src/api/routers/model.py b/src/api/routers/model.py
index 71054fb..e1de155 100644
--- a/src/api/routers/model.py
+++ b/src/api/routers/model.py
@@ -4,7 +4,7 @@ from fastapi import APIRouter, Depends, HTTPException, Path
 
 from api.auth import api_key_auth
 from api.models.bedrock import BedrockModel
-from api.schema import Models, Model
+from api.schema import Model, Models
 
 router = APIRouter(
     prefix="/models",
diff --git a/src/api/schema.py b/src/api/schema.py
index 74ecd98..cb74e7b 100644
--- a/src/api/schema.py
+++ b/src/api/schema.py
@@ -1,5 +1,5 @@
 import time
-from typing import Literal, Iterable
+from typing import Iterable, Literal
 
 from pydantic import BaseModel, Field