From 11b2568ff845be0045a6755ff88596d6450d98dd Mon Sep 17 00:00:00 2001 From: scosman Date: Wed, 28 Aug 2024 13:45:29 -0400 Subject: [PATCH] Fix all import sorts using Ruff --- app/desktop/desktop.py | 12 +++++++----- app/desktop/desktop_server.py | 5 +++-- app/desktop/test_desktop.py | 3 ++- checks.sh | 3 ++- libs/core/kiln_ai/adapters/ml_model_list.py | 7 ++++--- libs/core/kiln_ai/adapters/prompt_adapters.py | 4 +++- libs/core/kiln_ai/adapters/test_prompt_adaptors.py | 7 ++++--- libs/core/kiln_ai/datamodel/basemodel.py | 13 ++++++------- libs/core/kiln_ai/datamodel/models.py | 5 +++-- libs/core/kiln_ai/datamodel/test_basemodel.py | 5 +++-- libs/core/kiln_ai/datamodel/test_models.py | 3 ++- libs/studio/kiln_studio/server.py | 8 ++++---- libs/studio/tests/test_import.py | 2 +- 13 files changed, 44 insertions(+), 33 deletions(-) diff --git a/app/desktop/desktop.py b/app/desktop/desktop.py index d14169b2..3b06abe0 100644 --- a/app/desktop/desktop.py +++ b/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 diff --git a/app/desktop/desktop_server.py b/app/desktop/desktop_server.py index 82e637a5..75dbe83f 100644 --- a/app/desktop/desktop_server.py +++ b/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): diff --git a/app/desktop/test_desktop.py b/app/desktop/test_desktop.py index 5674a483..3912920b 100644 --- a/app/desktop/test_desktop.py +++ b/app/desktop/test_desktop.py @@ -1,5 +1,6 @@ -import desktop_server import random + +import desktop_server import requests diff --git a/checks.sh b/checks.sh index e8fd7321..4805c9cc 100755 --- a/checks.sh +++ b/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}" diff --git a/libs/core/kiln_ai/adapters/ml_model_list.py b/libs/core/kiln_ai/adapters/ml_model_list.py index a5b1ef1f..36ce83f7 100644 --- a/libs/core/kiln_ai/adapters/ml_model_list.py +++ b/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): diff --git a/libs/core/kiln_ai/adapters/prompt_adapters.py b/libs/core/kiln_ai/adapters/prompt_adapters.py index 78a20df0..f2787cca 100644 --- a/libs/core/kiln_ai/adapters/prompt_adapters.py +++ b/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): diff --git a/libs/core/kiln_ai/adapters/test_prompt_adaptors.py b/libs/core/kiln_ai/adapters/test_prompt_adaptors.py index 0c54b5ab..7b2b4b26 100644 --- a/libs/core/kiln_ai/adapters/test_prompt_adaptors.py +++ b/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): diff --git a/libs/core/kiln_ai/datamodel/basemodel.py b/libs/core/kiln_ai/datamodel/basemodel.py index aefc0048..a565afe3 100644 --- a/libs/core/kiln_ai/datamodel/basemodel.py +++ b/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()) diff --git a/libs/core/kiln_ai/datamodel/models.py b/libs/core/kiln_ai/datamodel/models.py index f1fd866f..77e38362 100644 --- a/libs/core/kiln_ai/datamodel/models.py +++ b/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. diff --git a/libs/core/kiln_ai/datamodel/test_basemodel.py b/libs/core/kiln_ai/datamodel/test_basemodel.py index cb80ef05..b8627372 100644 --- a/libs/core/kiln_ai/datamodel/test_basemodel.py +++ b/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: diff --git a/libs/core/kiln_ai/datamodel/test_models.py b/libs/core/kiln_ai/datamodel/test_models.py index e38e4961..7bb4b7f0 100644 --- a/libs/core/kiln_ai/datamodel/test_models.py +++ b/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 diff --git a/libs/studio/kiln_studio/server.py b/libs/studio/kiln_studio/server.py index 8f7db7a0..c898fa27 100644 --- a/libs/studio/kiln_studio/server.py +++ b/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 diff --git a/libs/studio/tests/test_import.py b/libs/studio/tests/test_import.py index ad6586b6..9601ddaa 100644 --- a/libs/studio/tests/test_import.py +++ b/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: