Fix all import sorts using Ruff

app/desktop/desktop.py

@@ -1,11 +1,13 @@
-import pystray
-from PIL import Image
+import contextlib
+import os
+import sys
 import tkinter as tk
 import webbrowser
-import sys
+
+import pystray
+from PIL import Image
+
 from .desktop_server import ThreadedServer, server_config
-import contextlib
-import os
 
 # TODO: remove this and all other globals in this file
 root = None  # type: tk.Tk | None

app/desktop/desktop_server.py

@@ -1,8 +1,9 @@
-import threading
 import contextlib
+import threading
 import time
-import uvicorn
+
 import kiln_studio.server as kiln_server
+import uvicorn
 
 
 def server_config(port=8757):

app/desktop/test_desktop.py

@@ -1,5 +1,6 @@
-import desktop_server
 import random
+
+import desktop_server
 import requests
 
 

checks.sh

@@ -12,7 +12,8 @@ headerStart="\n\033[4;34m=== "
 headerEnd=" ===\033[0m\n"
 
 echo "${headerStart}Checking Python: Ruff, format, check${headerEnd}"
-ruff check
+# I is import sorting
+ruff check --select I
 ruff format --check
 
 echo "${headerStart}Checking for Misspellings${headerEnd}"

libs/core/kiln_ai/adapters/ml_model_list.py

@@ -1,10 +1,11 @@
-from typing import Dict
 from enum import Enum
-from langchain_groq import ChatGroq
-from langchain_openai import ChatOpenAI
+from typing import Dict
+
 from langchain_aws import ChatBedrock
 from langchain_core.language_models.chat_models import BaseChatModel
 from langchain_core.language_models.fake_chat_models import FakeListChatModel
+from langchain_groq import ChatGroq
+from langchain_openai import ChatOpenAI
 
 
 class ModelName(str, Enum):

libs/core/kiln_ai/adapters/prompt_adapters.py

@@ -1,6 +1,8 @@
+from abc import ABCMeta, abstractmethod
+
 import kiln_ai.datamodel.models as models
+
 from .ml_model_list import model_from
-from abc import ABCMeta, abstractmethod
 
 
 class BasePromptAdapter(metaclass=ABCMeta):

libs/core/kiln_ai/adapters/test_prompt_adaptors.py

@@ -1,9 +1,10 @@
-import kiln_ai.datamodel.models as models
-from kiln_ai.adapters.prompt_adapters import SimplePromptAdapter
-import pytest
 import os
 from pathlib import Path
 
+import kiln_ai.datamodel.models as models
+import pytest
+from kiln_ai.adapters.prompt_adapters import SimplePromptAdapter
+
 
 @pytest.mark.paid
 async def test_groq(tmp_path):

libs/core/kiln_ai/datamodel/basemodel.py

@@ -1,13 +1,12 @@
-from pydantic import BaseModel, computed_field, Field, field_validator
-from typing import Optional
-from pathlib import Path
-from typing import Type, TypeVar
-from abc import ABCMeta, abstractmethod
+import json
+import re
 import uuid
+from abc import ABCMeta, abstractmethod
 from builtins import classmethod
-import re
-import json
+from pathlib import Path
+from typing import Optional, Type, TypeVar
 
+from pydantic import BaseModel, Field, computed_field, field_validator
 
 # ID is a 10 digit hex string
 ID_FIELD = Field(default_factory=lambda: uuid.uuid4().hex[:10].upper())

libs/core/kiln_ai/datamodel/models.py

@@ -1,7 +1,8 @@
-from .basemodel import KilnBaseModel, KilnParentedModel
-from pydantic import Field
 from enum import Enum, IntEnum
 
+from pydantic import Field
+
+from .basemodel import KilnBaseModel, KilnParentedModel
 
 # Conventions:
 # 1) Names are filename safe as they may be used as file names. They are informational and not to be used in prompts/training/validation.

libs/core/kiln_ai/datamodel/test_basemodel.py

@@ -1,9 +1,10 @@
 import json
-import pytest
-from kiln_ai.datamodel.basemodel import KilnBaseModel, KilnParentedModel
 from pathlib import Path
 from typing import Optional
 
+import pytest
+from kiln_ai.datamodel.basemodel import KilnBaseModel, KilnParentedModel
+
 
 @pytest.fixture
 def test_base_file(tmp_path) -> Path:

libs/core/kiln_ai/datamodel/test_models.py

@@ -1,6 +1,7 @@
 import json
+
 import pytest
-from kiln_ai.datamodel.models import Project, Task, TaskDeterminism, Priority
+from kiln_ai.datamodel.models import Priority, Project, Task, TaskDeterminism
 
 
 @pytest.fixture

libs/studio/kiln_studio/server.py

@@ -1,12 +1,12 @@
+import os
+import sys
+from pathlib import Path
 from typing import Union
 
 import uvicorn
+import yaml
 from fastapi import FastAPI
 from fastapi.staticfiles import StaticFiles
-import os
-import yaml
-from pathlib import Path
-import sys
 
 
 # TODO would rather this get passed. This class shouldn't know about desktop

libs/studio/tests/test_import.py

@@ -1,5 +1,5 @@
-import kiln_studio.server as server
 import kiln_ai.coreadd as coreadd
+import kiln_studio.server as server
 
 
 def test_import() -> None: