tidy: ruff autofixes

TODO.md

@@ -1,6 +1,5 @@
 # 📝 TODOs in Codebase
 
-- `./app.py:251:# TODO: Clean up imports.`
-- `./app.py:254:# TODO: This should be fixed - new comment`
+- `./app.py:245:# TODO: Clean up imports.`
 
 Keep up the great work! 🚀

app.py

@@ -1,26 +1,22 @@
-from pstuts_rag.configuration import Configuration
 import asyncio
-from typing import cast
+import logging
 import signal
+import time
 from datetime import datetime
+from typing import cast
+from uuid import uuid4
 
 import chainlit as cl
+import httpx
+import nest_asyncio
 from dotenv import load_dotenv
-
-from langgraph.checkpoint.memory import MemorySaver
-
 from langchain_core.runnables import Runnable
+from langgraph.checkpoint.memory import MemorySaver
 
+from pstuts_rag.configuration import Configuration
 from pstuts_rag.datastore import Datastore
 from pstuts_rag.nodes import FinalAnswer, TutorialState, initialize
-
-import nest_asyncio
-from uuid import uuid4
-
-import logging
-
 from pstuts_rag.utils import get_unique
-import httpx
 
 # Track the single active session
 active_session = {"id": None, "timestamp": None}
@@ -113,7 +109,7 @@ def format_video_reference(doc: Document):
         display="side",
     )
     video_message = cl.Message(
-        content=f'📼 Watch {video_link.name} (_@ {v["start_min"]}_)',  # text has to include video name
+        content=f"📼 Watch {video_link.name} (_@ {v['start_min']}_)",  # text has to include video name
         elements=[video_link],
     )
 
@@ -246,14 +242,9 @@ class ChainlitCallbackHandler(BaseCallbackHandler):
             print(f"Error in on_chain_error: {e}")
 
 
-import time
-
 # TODO: Clean up imports.
 
 
-# TODO: This should be fixed - new comment
-
-
 @cl.on_message
 async def main(input_message: cl.Message):
     """

pstuts_rag/pstuts_rag/datastore.py

@@ -1,32 +1,26 @@
 import asyncio
 import atexit
-import json
 import glob
-import aiofiles
-from pathlib import Path
-from typing import List, Dict, Iterator, Any, Callable, Optional, Self
-import uuid
+import json
 import logging
 import threading
+from pathlib import Path
+from typing import Any, Callable, Dict, Iterator, List, Optional, Self
 
+import aiofiles
 import chainlit as cl
-from langchain_core.document_loaders import BaseLoader
-from langchain_experimental.text_splitter import SemanticChunker
-from langchain_huggingface import HuggingFaceEmbeddings
-from langchain_openai.embeddings import OpenAIEmbeddings
-from langchain_ollama.embeddings import OllamaEmbeddings
 from langchain_core.documents import Document
 from langchain_core.embeddings import Embeddings
-
 from langchain_core.vectorstores import VectorStoreRetriever
-
+from langchain_experimental.text_splitter import SemanticChunker
 from langchain_qdrant import QdrantVectorStore
-from pstuts_rag.configuration import Configuration, ModelAPI
+from pathvalidate import sanitize_filename, sanitize_filepath
 from qdrant_client import QdrantClient
 from qdrant_client.http.models import Distance, VectorParams
 from qdrant_client.models import PointStruct
-from pstuts_rag.utils import get_embeddings_api, flatten, batch
-from pathvalidate import sanitize_filename, sanitize_filepath
+
+from pstuts_rag.configuration import Configuration
+from pstuts_rag.utils import batch, flatten, get_embeddings_api
 
 
 class QdrantClientSingleton:

pstuts_rag/pstuts_rag/evaluator_utils.py

@@ -1,20 +1,17 @@
+import asyncio
 import uuid
-import pandas as pd
-import numpy as np
 from functools import partial
-from ragas import EvaluationDataset
-from langchain_core.runnables import Runnable
-from typing import Set, Tuple, Dict, List
-from sklearn.model_selection import train_test_split
+from typing import Dict, Mapping, Set, Tuple
+
 import bidict
-from typing import Mapping
-from itertools import chain
-import asyncio
-from typing import Optional
-from tqdm import tqdm
-from .datastore import batch
 import numpy as np
+import pandas as pd
+from langchain_core.runnables import Runnable
+from ragas import EvaluationDataset
 from scipy.stats import norm
+from sklearn.model_selection import train_test_split
+
+from .datastore import batch
 
 
 async def apply_rag_chain_inplace(

pstuts_rag/pstuts_rag/nodes.py

@@ -1,32 +1,27 @@
 # nodes.py
-from enum import Enum
-from typing import Annotated, Any, Callable, Dict, Literal, Tuple, Union
-import functools
 import asyncio
-import os
+import functools
 import logging
 import operator
-from langchain_openai import ChatOpenAI
-from langgraph.graph import StateGraph, MessagesState, START, END
-from langgraph.types import Command
+import os
+from enum import Enum
+from typing import Annotated, Dict, Literal, Tuple
+
+from langchain_community.tools.tavily_search import TavilySearchResults
 from langchain_core.documents import Document
+from langchain_core.messages import AIMessage, BaseMessage, HumanMessage
 from langchain_core.runnables import RunnableConfig
-from langchain_core.messages import HumanMessage, AIMessage, BaseMessage
-from langgraph.checkpoint.memory import MemorySaver
-from numpy import add
-from langchain_community.tools.tavily_search import TavilySearchResults
 from langchain_tavily import TavilyExtract
-
-from pydantic import BaseModel, Field, HttpUrl
-
-from langgraph.types import interrupt
 from langgraph.checkpoint.memory import MemorySaver
+from langgraph.graph import END, START, MessagesState, StateGraph
+from langgraph.types import interrupt
+from pydantic import BaseModel, Field, HttpUrl
 
-from pstuts_rag.utils import get_chat_api, get_title_streaming
 from pstuts_rag.configuration import Configuration
 from pstuts_rag.datastore import Datastore
 from pstuts_rag.prompts import NODE_PROMPTS
 from pstuts_rag.rag_for_transcripts import create_transcript_rag_chain
+from pstuts_rag.utils import get_chat_api, get_title_streaming
 
 
 class YesNoAsk(Enum):

pstuts_rag/pstuts_rag/rag_for_transcripts.py

@@ -1,28 +1,24 @@
-import functools
 import json
-import asyncio
-from operator import itemgetter
-from typing import Any, Dict, Union, Optional, Callable
-import logging
 import re
+from operator import itemgetter
+from typing import Any, Dict
 
 from langchain.prompts import ChatPromptTemplate
 from langchain_core.messages import AIMessage
 from langchain_core.runnables import (
     Runnable,
-    RunnableParallel,
-    RunnablePassthrough,
     RunnableConfig,
     RunnableLambda,
+    RunnableParallel,
+    RunnablePassthrough,
 )
 from langchain_openai import ChatOpenAI
-from langchain_huggingface import ChatHuggingFace
-from langchain_ollama import ChatOllama
+
+from pstuts_rag.configuration import Configuration
+from pstuts_rag.utils import ChatAPISelector
 
 from .datastore import Datastore
 from .prompts import RAG_PROMPT_TEMPLATES
-from pstuts_rag.utils import ChatAPISelector
-from pstuts_rag.configuration import Configuration, ModelAPI
 
 
 def post_process_response(
@@ -57,11 +53,6 @@ def post_process_response(
         if configurable.eva_strip_think
         else answer.content
     )
-    # Only append references if the model provided a substantive answer
-    # if "I don't know" not in answer.content:
-    #     text_w_references = "\n".join(
-    #         [str(text_w_references), "**REFERENCES**", references]
-    #     )
 
     if "I don't know." in answer_text:
         attachments = []

pstuts_rag/pstuts_rag/state.py

@@ -1,8 +1,8 @@
-from pydantic import BaseModel, Field
-from langchain_core.messages import BaseMessage
-from typing import List, Optional, Tuple, Dict, Annotated
-
 import operator
+from typing import Annotated, Dict, List, Optional, Tuple
+
+from langchain_core.messages import BaseMessage
+from pydantic import BaseModel, Field
 
 
 class PsTutsTeamState(BaseModel):

pstuts_rag/pstuts_rag/utils.py

@@ -1,27 +1,16 @@
-from typing import Dict, List, Type, Any, Iterator
-
-from langchain_openai import ChatOpenAI
-from langchain_openai.embeddings import OpenAIEmbeddings
-
-from langchain_huggingface import ChatHuggingFace
-from langchain_huggingface import HuggingFaceEmbeddings
+import logging
+import re
+from typing import Any, Dict, Iterator, List, Type
 
+import requests
+from bs4 import BeautifulSoup
+from langchain_huggingface import ChatHuggingFace, HuggingFaceEmbeddings
 from langchain_ollama import ChatOllama
 from langchain_ollama.embeddings import OllamaEmbeddings
+from langchain_openai import ChatOpenAI
+from langchain_openai.embeddings import OpenAIEmbeddings
 
 from pstuts_rag.configuration import ModelAPI
-import logging
-
-from contextvars import ContextVar
-from functools import wraps
-from typing import Callable, Optional
-import time
-import traceback
-
-
-import requests
-import re
-from bs4 import BeautifulSoup
 
 # Chat model selector dictionary
 ChatAPISelector: Dict[

pyproject.toml

@@ -53,8 +53,6 @@ dependencies = [
     "beautifulsoup4>=4.13.4",
     "pathvalidate>=3.2.3",
     "pydantic-settings>=2.9.1",
-    "flake8-todos>=0.3.1",
-    "ruff>=0.11.0",
 ]
 authors = [{ name = "Marko Budisic", email = "mbudisic@gmail.com" }]
 license = "MIT"
@@ -70,13 +68,11 @@ packages = ["pstuts_rag/pstuts_rag"]
 dev = [
     "pytest>=7.0.0",
     "black>=22.0.0",
-    "flake8>=4.0.0",
-    "flake8-todos>=0.3.1",
     "mypy>=0.900",
-    "isort>=6.0.1",
     "pylint-venv>=3.0.4",
     "ipdb>=0.13.13",
     "deptry>=0.23.0",
+    "ruff"
 ]
 
 web = [
@@ -92,13 +88,12 @@ line-length = 79
 target-version = "py311"
 
 [tool.ruff.lint]
-select = ["E", "F", "I", "N", "W"]
-extend-select = ["TD"]
-ignore = []
-task-tags = ["TODO", "FIXME", "BUG", "HACK", "XXX"]
+select = ["E", "F", "I", "N", "W", "TD"]
+fixable = ["I", "E", "F", "W", "B"]
+
+[tool.ruff.lint.isort]
+known-first-party = ["pstuts_rag"]
 
-[tool.ruff.isort]
-known-first-party = ["src"]
 
 [tool.black]
 line-length = 79

uv.lock

@@ -781,33 +781,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/18/79/1b8fa1bb3568781e84c9200f951c735f3f157429f44be0495da55894d620/filetype-1.2.0-py2.py3-none-any.whl", hash = "sha256:7ce71b6880181241cf7ac8697a2f1eb6a8bd9b429f7ad6d27b8db9ba5f1c2d25", size = 19970 },
 ]
 
-[[package]]
-name = "flake8"
-version = "7.2.0"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "mccabe" },
-    { name = "pycodestyle" },
-    { name = "pyflakes" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/e7/c4/5842fc9fc94584c455543540af62fd9900faade32511fab650e9891ec225/flake8-7.2.0.tar.gz", hash = "sha256:fa558ae3f6f7dbf2b4f22663e5343b6b6023620461f8d4ff2019ef4b5ee70426", size = 48177 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/83/5c/0627be4c9976d56b1217cb5187b7504e7fd7d3503f8bfd312a04077bd4f7/flake8-7.2.0-py2.py3-none-any.whl", hash = "sha256:93b92ba5bdb60754a6da14fa3b93a9361fd00a59632ada61fd7b130436c40343", size = 57786 },
-]
-
-[[package]]
-name = "flake8-todos"
-version = "0.3.1"
-source = { registry = "https://pypi.org/simple" }
-dependencies = [
-    { name = "flake8" },
-    { name = "pycodestyle" },
-]
-sdist = { url = "https://files.pythonhosted.org/packages/88/69/e4ecde7f50c3c874046f03dc7bda67d7be8e7cc28380f3f44c07456b45ad/flake8_todos-0.3.1.tar.gz", hash = "sha256:942101a08f831d7d9f7d864d86169f3bcfaf8b6d56a004c0280eb51725266b16", size = 7851 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/ba/8e/805907f920d171eda033ac825d23595072a1c04dd716106c8bc8ec9eec9e/flake8_todos-0.3.1-py3-none-any.whl", hash = "sha256:0b4faca80bec49be7bf8e5dd46eec12f619e09cecac8a84a87775272300222b2", size = 7358 },
-]
-
 [[package]]
 name = "forbiddenfruit"
 version = "0.1.4"
@@ -1307,15 +1280,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/7b/55/e5326141505c5d5e34c5e0935d2908a74e4561eca44108fbfb9c13d2911a/isoduration-20.11.0-py3-none-any.whl", hash = "sha256:b2904c2a4228c3d44f409c8ae8e2370eb21a26f7ac2ec5446df141dde3452042", size = 11321 },
 ]
 
-[[package]]
-name = "isort"
-version = "6.0.1"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/b8/21/1e2a441f74a653a144224d7d21afe8f4169e6c7c20bb13aec3a2dc3815e0/isort-6.0.1.tar.gz", hash = "sha256:1cb5df28dfbc742e490c5e41bad6da41b805b0a8be7bc93cd0fb2a8a890ac450", size = 821955 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/c1/11/114d0a5f4dabbdcedc1125dee0888514c3c3b16d3e9facad87ed96fad97c/isort-6.0.1-py3-none-any.whl", hash = "sha256:2dc5d7f65c9678d94c88dfc29161a320eec67328bc97aad576874cb4be1e9615", size = 94186 },
-]
-
 [[package]]
 name = "jedi"
 version = "0.19.2"
@@ -2208,15 +2172,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/8f/8e/9ad090d3553c280a8060fbf6e24dc1c0c29704ee7d1c372f0c174aa59285/matplotlib_inline-0.1.7-py3-none-any.whl", hash = "sha256:df192d39a4ff8f21b1895d72e6a13f5fcc5099f00fa84384e0ea28c2cc0653ca", size = 9899 },
 ]
 
-[[package]]
-name = "mccabe"
-version = "0.7.0"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/e7/ff/0ffefdcac38932a54d2b5eed4e0ba8a408f215002cd178ad1df0f2806ff8/mccabe-0.7.0.tar.gz", hash = "sha256:348e0240c33b60bbdf4e523192ef919f28cb2c3d7d5c7794f74009290f236325", size = 9658 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/27/1a/1f68f9ba0c207934b35b86a8ca3aad8395a3d6dd7921c0686e23853ff5a9/mccabe-0.7.0-py2.py3-none-any.whl", hash = "sha256:6c2d30ab6be0e4a46919781807b4f0d834ebdd6c6e3dca0bda5a15f863427b6e", size = 7350 },
-]
-
 [[package]]
 name = "mcp"
 version = "1.9.2"
@@ -3756,7 +3711,6 @@ dependencies = [
     { name = "bidict" },
     { name = "chainlit" },
     { name = "datasets" },
-    { name = "flake8-todos" },
     { name = "google" },
     { name = "ipykernel" },
     { name = "ipywidgets" },
@@ -3785,7 +3739,6 @@ dependencies = [
     { name = "qdrant-client" },
     { name = "ragas" },
     { name = "requests" },
-    { name = "ruff" },
     { name = "scikit-learn" },
     { name = "scipy" },
     { name = "sentence-transformers" },
@@ -3802,13 +3755,11 @@ dependencies = [
 dev = [
     { name = "black" },
     { name = "deptry" },
-    { name = "flake8" },
-    { name = "flake8-todos" },
     { name = "ipdb" },
-    { name = "isort" },
     { name = "mypy" },
     { name = "pylint-venv" },
     { name = "pytest" },
+    { name = "ruff" },
 ]
 web = [
     { name = "fastapi" },
@@ -3828,15 +3779,11 @@ requires-dist = [
     { name = "datasets", specifier = ">=3.6.0" },
     { name = "deptry", marker = "extra == 'dev'", specifier = ">=0.23.0" },
     { name = "fastapi", marker = "extra == 'web'", specifier = ">=0.115.3,<0.116" },
-    { name = "flake8", marker = "extra == 'dev'", specifier = ">=4.0.0" },
-    { name = "flake8-todos", specifier = ">=0.3.1" },
-    { name = "flake8-todos", marker = "extra == 'dev'", specifier = ">=0.3.1" },
     { name = "google", specifier = ">=3.0.0" },
     { name = "httpx", marker = "extra == 'web'", specifier = "==0.27.0" },
     { name = "ipdb", marker = "extra == 'dev'", specifier = ">=0.13.13" },
     { name = "ipykernel", specifier = ">=6.29.5" },
     { name = "ipywidgets", specifier = ">=8.1.7" },
-    { name = "isort", marker = "extra == 'dev'", specifier = ">=6.0.1" },
     { name = "jupyter", specifier = ">=1.1.1" },
     { name = "jupyter-contrib-nbextensions", specifier = ">=0.7.0" },
     { name = "langchain", specifier = ">=0.3.25" },
@@ -3866,7 +3813,7 @@ requires-dist = [
     { name = "qdrant-client", specifier = ">=1.8.0" },
     { name = "ragas", specifier = ">=0.2.15" },
     { name = "requests", specifier = ">=2.31.0" },
-    { name = "ruff", specifier = ">=0.11.0" },
+    { name = "ruff", marker = "extra == 'dev'" },
     { name = "scikit-learn", specifier = ">=1.0.0" },
     { name = "scipy", specifier = ">=1.10.0" },
     { name = "sentence-transformers", specifier = ">=3.4.1" },
@@ -3959,15 +3906,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/37/40/ad395740cd641869a13bcf60851296c89624662575621968dcfafabaa7f6/pyarrow-20.0.0-cp313-cp313t-win_amd64.whl", hash = "sha256:82f1ee5133bd8f49d31be1299dc07f585136679666b502540db854968576faf9", size = 25944982 },
 ]
 
-[[package]]
-name = "pycodestyle"
-version = "2.13.0"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/04/6e/1f4a62078e4d95d82367f24e685aef3a672abfd27d1a868068fed4ed2254/pycodestyle-2.13.0.tar.gz", hash = "sha256:c8415bf09abe81d9c7f872502a6eee881fbe85d8763dd5b9924bb0a01d67efae", size = 39312 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/07/be/b00116df1bfb3e0bb5b45e29d604799f7b91dd861637e4d448b4e09e6a3e/pycodestyle-2.13.0-py2.py3-none-any.whl", hash = "sha256:35863c5974a271c7a726ed228a14a4f6daf49df369d8c50cd9a6f58a5e143ba9", size = 31424 },
-]
-
 [[package]]
 name = "pycparser"
 version = "2.22"
@@ -4058,15 +3996,6 @@ wheels = [
     { url = "https://files.pythonhosted.org/packages/b6/5f/d6d641b490fd3ec2c4c13b4244d68deea3a1b970a97be64f34fb5504ff72/pydantic_settings-2.9.1-py3-none-any.whl", hash = "sha256:59b4f431b1defb26fe620c71a7d3968a710d719f5f4cdbbdb7926edeb770f6ef", size = 44356 },
 ]
 
-[[package]]
-name = "pyflakes"
-version = "3.3.2"
-source = { registry = "https://pypi.org/simple" }
-sdist = { url = "https://files.pythonhosted.org/packages/af/cc/1df338bd7ed1fa7c317081dcf29bf2f01266603b301e6858856d346a12b3/pyflakes-3.3.2.tar.gz", hash = "sha256:6dfd61d87b97fba5dcfaaf781171ac16be16453be6d816147989e7f6e6a9576b", size = 64175 }
-wheels = [
-    { url = "https://files.pythonhosted.org/packages/15/40/b293a4fa769f3b02ab9e387c707c4cbdc34f073f945de0386107d4e669e6/pyflakes-3.3.2-py2.py3-none-any.whl", hash = "sha256:5039c8339cbb1944045f4ee5466908906180f13cc99cc9949348d10f82a5c32a", size = 63164 },
-]
-
 [[package]]
 name = "pygments"
 version = "2.19.1"