From 4e1866ceee24249aafa52427a354cc8a3a481fc7 Mon Sep 17 00:00:00 2001 From: Pavel Tisnovsky Date: Sun, 1 Jun 2025 12:18:53 +0200 Subject: [PATCH 1/3] Ruff CI check --- .github/workflows/ruff.yaml | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) create mode 100644 .github/workflows/ruff.yaml diff --git a/.github/workflows/ruff.yaml b/.github/workflows/ruff.yaml new file mode 100644 index 00000000..735bfbe3 --- /dev/null +++ b/.github/workflows/ruff.yaml @@ -0,0 +1,18 @@ +name: Ruff + +on: + - push + - pull_request + +jobs: + ruff: + runs-on: ubuntu-latest + permissions: + contents: read + pull-requests: read + steps: + - uses: actions/checkout@v4 + - uses: chartboost/ruff-action@v1 + with: + args: 'check . --per-file-ignores=tests/*:S101 --per-file-ignores=scripts/*:S101' + From 0b716f617cfefd588eb2dd203f562dae1cf20026 Mon Sep 17 00:00:00 2001 From: Pavel Tisnovsky Date: Sun, 1 Jun 2025 12:21:44 +0200 Subject: [PATCH 2/3] Removed unused imports --- src/app/endpoints/config.py | 1 - src/app/endpoints/models.py | 1 - src/app/main.py | 1 - tests/unit/app/endpoints/test_config.py | 4 ---- tests/unit/models/test_config.py | 2 +- tests/unit/runners/test_uvicorn_runner.py | 1 - 6 files changed, 1 insertion(+), 9 deletions(-) diff --git a/src/app/endpoints/config.py b/src/app/endpoints/config.py index 07038c26..19ab1f2d 100644 --- a/src/app/endpoints/config.py +++ b/src/app/endpoints/config.py @@ -5,7 +5,6 @@ from fastapi import APIRouter, Request -from version import __version__ from models.config import Configuration from configuration import configuration diff --git a/src/app/endpoints/models.py b/src/app/endpoints/models.py index ed5d1e52..d9b9d40d 100644 --- a/src/app/endpoints/models.py +++ b/src/app/endpoints/models.py @@ -4,7 +4,6 @@ from typing import Any from fastapi import APIRouter, Request -from llama_stack_client import LlamaStackClient # type: ignore from client import get_llama_stack_client from configuration import configuration diff --git a/src/app/main.py b/src/app/main.py index 4d0a6b2a..0b1f6cf0 100644 --- a/src/app/main.py +++ b/src/app/main.py @@ -1,7 +1,6 @@ from fastapi import FastAPI from app import routers import version -import logging from log import get_logger diff --git a/tests/unit/app/endpoints/test_config.py b/tests/unit/app/endpoints/test_config.py index 580c77db..9a7aec9a 100644 --- a/tests/unit/app/endpoints/test_config.py +++ b/tests/unit/app/endpoints/test_config.py @@ -1,10 +1,6 @@ -from fastapi import HTTPException, status -from fastapi import Request import pytest from app.endpoints.config import config_endpoint_handler -from models.config import Configuration -from configuration import configuration from configuration import AppConfig diff --git a/tests/unit/models/test_config.py b/tests/unit/models/test_config.py index cbc814f5..16133054 100644 --- a/tests/unit/models/test_config.py +++ b/tests/unit/models/test_config.py @@ -2,7 +2,7 @@ import pytest -from models.config import Configuration, LLamaStackConfiguration, ServiceConfiguration +from models.config import LLamaStackConfiguration, ServiceConfiguration def test_service_configuration_constructor() -> None: diff --git a/tests/unit/runners/test_uvicorn_runner.py b/tests/unit/runners/test_uvicorn_runner.py index 1c1f8b3b..953a66e0 100644 --- a/tests/unit/runners/test_uvicorn_runner.py +++ b/tests/unit/runners/test_uvicorn_runner.py @@ -2,7 +2,6 @@ from unittest.mock import patch -import pytest from runners.uvicorn import start_uvicorn From ef143c86b584861aeaf296d5fa79a66c3ae95a1f Mon Sep 17 00:00:00 2001 From: Pavel Tisnovsky Date: Sun, 1 Jun 2025 12:22:55 +0200 Subject: [PATCH 3/3] Fixed linter problems found by Ruff --- tests/unit/models/test_config.py | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/tests/unit/models/test_config.py b/tests/unit/models/test_config.py index 16133054..1f99c087 100644 --- a/tests/unit/models/test_config.py +++ b/tests/unit/models/test_config.py @@ -35,21 +35,23 @@ def test_service_configuration_workers_value() -> None: def test_llama_stack_configuration_constructor() -> None: """Test the LLamaStackConfiguration constructor.""" - l = LLamaStackConfiguration( + llama_stack_configuration = LLamaStackConfiguration( use_as_library_client=True, library_client_config_path="foo" ) - assert l is not None + assert llama_stack_configuration is not None - l = LLamaStackConfiguration(use_as_library_client=False, url="http://localhost") - assert l is not None + llama_stack_configuration = LLamaStackConfiguration( + use_as_library_client=False, url="http://localhost" + ) + assert llama_stack_configuration is not None - l = LLamaStackConfiguration(url="http://localhost") - assert l is not None + llama_stack_configuration = LLamaStackConfiguration(url="http://localhost") + assert llama_stack_configuration is not None - l = LLamaStackConfiguration( + llama_stack_configuration = LLamaStackConfiguration( use_as_library_client=False, url="http://localhost", api_key="foo" ) - assert l is not None + assert llama_stack_configuration is not None def test_llama_stack_wrong_configuration_constructor_no_url() -> None: